From cba22adcd103d00c5801f30384fe97f6939c2c2e Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sun, 24 Oct 2021 03:08:45 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 18 +++++++++++++++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 18 +++++++++++++++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 18 +++++++++++++++--- ...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 | 18 +++++++++++++++--- .../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_hellen-nb1.h | 4 ++-- .../generated/signature_hellen121nissan.h | 4 ++-- .../generated/signature_hellen121vag.h | 4 ++-- .../generated/signature_hellen128.h | 4 ++-- .../generated/signature_hellen154hyundai.h | 4 ++-- .../generated/signature_hellen72.h | 4 ++-- .../generated/signature_hellen88bmw.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 2099084 -> 2101436 bytes firmware/tunerstudio/generated/rusefi.ini | 8 ++++---- .../tunerstudio/generated/rusefi_atlas.ini | 8 ++++---- .../generated/rusefi_f429-discovery.ini | 8 ++++---- .../generated/rusefi_frankenso_na6.ini | 8 ++++---- .../generated/rusefi_hellen-nb1.ini | 8 ++++---- .../generated/rusefi_hellen121nissan.ini | 8 ++++---- .../generated/rusefi_hellen121vag.ini | 8 ++++---- .../generated/rusefi_hellen128mercedes.ini | 8 ++++---- .../generated/rusefi_hellen154hyundai.ini | 8 ++++---- .../tunerstudio/generated/rusefi_hellen72.ini | 8 ++++---- .../generated/rusefi_hellen88bmw.ini | 8 ++++---- .../generated/rusefi_hellenNA6.ini | 8 ++++---- .../generated/rusefi_hellen_cypress.ini | 8 ++++---- .../tunerstudio/generated/rusefi_kinetis.ini | 8 ++++---- .../tunerstudio/generated/rusefi_mre_f4.ini | 8 ++++---- .../tunerstudio/generated/rusefi_mre_f7.ini | 8 ++++---- .../generated/rusefi_prometheus_405.ini | 8 ++++---- .../generated/rusefi_prometheus_469.ini | 8 ++++---- .../generated/rusefi_proteus_f4.ini | 8 ++++---- .../generated/rusefi_proteus_f7.ini | 8 ++++---- .../generated/rusefi_subaru_eg33_f7.ini | 8 ++++---- .../com/rusefi/config/generated/Fields.java | 16 ++++++++++++++-- java_console/rusefi.xml | 2 +- 57 files changed, 213 insertions(+), 153 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 a3818f9b2b..8ebc1cd803 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Oct 24 01:59:50 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Oct 24 03:07:25 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4393,4 +4393,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Oct 24 01:59:50 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Oct 24 03:07:25 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 664eda2c3f..8723b4d01b 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 @@ -771,7 +771,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" #define engine_type_e_BMW_M73_F ET_BMW_M73_F #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 104 @@ -793,6 +793,8 @@ #define engine_type_e_HELLEN72_ETB 33 #define engine_type_e_HELLEN_121_NISSAN_4_CYL ET_HELLEN_121_NISSAN_4_CYL #define engine_type_e_HELLEN_121_NISSAN_6_CYL ET_HELLEN_121_NISSAN_6_CYL +#define engine_type_e_HELLEN_121_NISSAN_8_CYL 85 +#define engine_type_e_HELLEN_121_NISSAN_ALMERA_N16 87 #define engine_type_e_HELLEN_121_VAG ET_HELLEN_121_VAG #define engine_type_e_HELLEN_121_VAG_5_CYL ET_HELLEN_121_VAG_5_CYL #define engine_type_e_HELLEN_121_VAG_8_CYL ET_HELLEN_121_VAG_8_CYL @@ -810,6 +812,7 @@ #define engine_type_e_HELLEN_NA6 ET_HELLEN_NA6 #define engine_type_e_HELLEN_NA94 ET_HELLEN_NA94 #define engine_type_e_HELLEN_NB1 ET_HELLEN_NB1 +#define engine_type_e_HELLEN_NB1_36 94 #define engine_type_e_HELLEN_NB2 ET_HELLEN_NB2 #define engine_type_e_HELLEN_NB2_36 ET_HELLEN_NB2_36 #define engine_type_e_HONDA_600 43 @@ -868,6 +871,13 @@ #define engine_type_e_TLE8888_BENCH_ENGINE 59 #define engine_type_e_TOYOTA_2JZ_GTE_VVTi 44 #define engine_type_e_TOYOTA_JZS147 38 +#define engine_type_e_UNUSED10 10 +#define engine_type_e_UNUSED25 25 +#define engine_type_e_UNUSED5 4 +#define engine_type_e_UNUSED96 96 +#define engine_type_e_UNUSED97 97 +#define engine_type_e_UNUSED98 98 +#define engine_type_e_UNUSED99 99 #define engine_type_e_UNUSED_48 48 #define engine_type_e_UNUSED_50 50 #define engine_type_e_UNUSED_51 51 @@ -882,6 +892,8 @@ #define engineMake_offset 1096 #define engineSnifferRpmThreshold_offset 4 #define engineType_offset 0 +#define ENUM_16_BITS 60000 +#define ENUM_32_BITS 2000000000 #define ERROR_BUFFER_SIZE 120 #define ET_BMW_M73_F 40 #define ET_CAMARO 35 @@ -1855,7 +1867,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 2428038008 +#define SIGNATURE_HASH 4249277139 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2323,7 +2335,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen_cypress.2428038008" +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen_cypress.4249277139" #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 1a4d64bd8f..6f216b83f9 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Oct 24 01:59:47 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Oct 24 03:07:23 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4387,4 +4387,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Oct 24 01:59:47 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Oct 24 03:07:23 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 cde8ca0889..446db571b9 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -752,7 +752,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" #define engine_type_e_BMW_M73_F ET_BMW_M73_F #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 104 @@ -774,6 +774,8 @@ #define engine_type_e_HELLEN72_ETB 33 #define engine_type_e_HELLEN_121_NISSAN_4_CYL ET_HELLEN_121_NISSAN_4_CYL #define engine_type_e_HELLEN_121_NISSAN_6_CYL ET_HELLEN_121_NISSAN_6_CYL +#define engine_type_e_HELLEN_121_NISSAN_8_CYL 85 +#define engine_type_e_HELLEN_121_NISSAN_ALMERA_N16 87 #define engine_type_e_HELLEN_121_VAG ET_HELLEN_121_VAG #define engine_type_e_HELLEN_121_VAG_5_CYL ET_HELLEN_121_VAG_5_CYL #define engine_type_e_HELLEN_121_VAG_8_CYL ET_HELLEN_121_VAG_8_CYL @@ -791,6 +793,7 @@ #define engine_type_e_HELLEN_NA6 ET_HELLEN_NA6 #define engine_type_e_HELLEN_NA94 ET_HELLEN_NA94 #define engine_type_e_HELLEN_NB1 ET_HELLEN_NB1 +#define engine_type_e_HELLEN_NB1_36 94 #define engine_type_e_HELLEN_NB2 ET_HELLEN_NB2 #define engine_type_e_HELLEN_NB2_36 ET_HELLEN_NB2_36 #define engine_type_e_HONDA_600 43 @@ -849,6 +852,13 @@ #define engine_type_e_TLE8888_BENCH_ENGINE 59 #define engine_type_e_TOYOTA_2JZ_GTE_VVTi 44 #define engine_type_e_TOYOTA_JZS147 38 +#define engine_type_e_UNUSED10 10 +#define engine_type_e_UNUSED25 25 +#define engine_type_e_UNUSED5 4 +#define engine_type_e_UNUSED96 96 +#define engine_type_e_UNUSED97 97 +#define engine_type_e_UNUSED98 98 +#define engine_type_e_UNUSED99 99 #define engine_type_e_UNUSED_48 48 #define engine_type_e_UNUSED_50 50 #define engine_type_e_UNUSED_51 51 @@ -863,6 +873,8 @@ #define engineMake_offset 1096 #define engineSnifferRpmThreshold_offset 4 #define engineType_offset 0 +#define ENUM_16_BITS 60000 +#define ENUM_32_BITS 2000000000 #define ERROR_BUFFER_SIZE 120 #define ET_BMW_M73_F 40 #define ET_CAMARO 35 @@ -1836,7 +1848,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 1864181636 +#define SIGNATURE_HASH 48438831 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2304,7 +2316,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.10.24.kin.1864181636" +#define TS_SIGNATURE "rusEFI 2021.10.24.kin.48438831" #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 f5bb7b31f8..f020086fc8 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:52 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 Sun Oct 24 03:07:26 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4393,4 +4393,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:52 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 Sun Oct 24 03:07:26 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 0d01b2303f..69416fe907 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 @@ -783,7 +783,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" #define engine_type_e_BMW_M73_F ET_BMW_M73_F #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 104 @@ -805,6 +805,8 @@ #define engine_type_e_HELLEN72_ETB 33 #define engine_type_e_HELLEN_121_NISSAN_4_CYL ET_HELLEN_121_NISSAN_4_CYL #define engine_type_e_HELLEN_121_NISSAN_6_CYL ET_HELLEN_121_NISSAN_6_CYL +#define engine_type_e_HELLEN_121_NISSAN_8_CYL 85 +#define engine_type_e_HELLEN_121_NISSAN_ALMERA_N16 87 #define engine_type_e_HELLEN_121_VAG ET_HELLEN_121_VAG #define engine_type_e_HELLEN_121_VAG_5_CYL ET_HELLEN_121_VAG_5_CYL #define engine_type_e_HELLEN_121_VAG_8_CYL ET_HELLEN_121_VAG_8_CYL @@ -822,6 +824,7 @@ #define engine_type_e_HELLEN_NA6 ET_HELLEN_NA6 #define engine_type_e_HELLEN_NA94 ET_HELLEN_NA94 #define engine_type_e_HELLEN_NB1 ET_HELLEN_NB1 +#define engine_type_e_HELLEN_NB1_36 94 #define engine_type_e_HELLEN_NB2 ET_HELLEN_NB2 #define engine_type_e_HELLEN_NB2_36 ET_HELLEN_NB2_36 #define engine_type_e_HONDA_600 43 @@ -880,6 +883,13 @@ #define engine_type_e_TLE8888_BENCH_ENGINE 59 #define engine_type_e_TOYOTA_2JZ_GTE_VVTi 44 #define engine_type_e_TOYOTA_JZS147 38 +#define engine_type_e_UNUSED10 10 +#define engine_type_e_UNUSED25 25 +#define engine_type_e_UNUSED5 4 +#define engine_type_e_UNUSED96 96 +#define engine_type_e_UNUSED97 97 +#define engine_type_e_UNUSED98 98 +#define engine_type_e_UNUSED99 99 #define engine_type_e_UNUSED_48 48 #define engine_type_e_UNUSED_50 50 #define engine_type_e_UNUSED_51 51 @@ -894,6 +904,8 @@ #define engineMake_offset 1096 #define engineSnifferRpmThreshold_offset 4 #define engineType_offset 0 +#define ENUM_16_BITS 60000 +#define ENUM_32_BITS 2000000000 #define ERROR_BUFFER_SIZE 120 #define ET_BMW_M73_F 40 #define ET_CAMARO 35 @@ -1868,7 +1880,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 1196350411 +#define SIGNATURE_HASH 716235360 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2336,7 +2348,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.10.24.subaru_eg33_f7.1196350411" +#define TS_SIGNATURE "rusEFI 2021.10.24.subaru_eg33_f7.716235360" #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 ec070da9b9..e6532aa8fb 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:44 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:21 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4393,4 +4393,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:44 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:21 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 77c4d34adf..0b277b1a6a 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:44 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:21 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 4c85be4c65..7d74f7ecaf 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:44 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:21 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 9c378b6fab..38813db540 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:44 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:21 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 d186fad372..fb3b3ce39c 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:44 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:21 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 d65b37dbb0..1c4b552892 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -771,7 +771,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" #define engine_type_e_BMW_M73_F ET_BMW_M73_F #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 104 @@ -793,6 +793,8 @@ #define engine_type_e_HELLEN72_ETB 33 #define engine_type_e_HELLEN_121_NISSAN_4_CYL ET_HELLEN_121_NISSAN_4_CYL #define engine_type_e_HELLEN_121_NISSAN_6_CYL ET_HELLEN_121_NISSAN_6_CYL +#define engine_type_e_HELLEN_121_NISSAN_8_CYL 85 +#define engine_type_e_HELLEN_121_NISSAN_ALMERA_N16 87 #define engine_type_e_HELLEN_121_VAG ET_HELLEN_121_VAG #define engine_type_e_HELLEN_121_VAG_5_CYL ET_HELLEN_121_VAG_5_CYL #define engine_type_e_HELLEN_121_VAG_8_CYL ET_HELLEN_121_VAG_8_CYL @@ -810,6 +812,7 @@ #define engine_type_e_HELLEN_NA6 ET_HELLEN_NA6 #define engine_type_e_HELLEN_NA94 ET_HELLEN_NA94 #define engine_type_e_HELLEN_NB1 ET_HELLEN_NB1 +#define engine_type_e_HELLEN_NB1_36 94 #define engine_type_e_HELLEN_NB2 ET_HELLEN_NB2 #define engine_type_e_HELLEN_NB2_36 ET_HELLEN_NB2_36 #define engine_type_e_HONDA_600 43 @@ -868,6 +871,13 @@ #define engine_type_e_TLE8888_BENCH_ENGINE 59 #define engine_type_e_TOYOTA_2JZ_GTE_VVTi 44 #define engine_type_e_TOYOTA_JZS147 38 +#define engine_type_e_UNUSED10 10 +#define engine_type_e_UNUSED25 25 +#define engine_type_e_UNUSED5 4 +#define engine_type_e_UNUSED96 96 +#define engine_type_e_UNUSED97 97 +#define engine_type_e_UNUSED98 98 +#define engine_type_e_UNUSED99 99 #define engine_type_e_UNUSED_48 48 #define engine_type_e_UNUSED_50 50 #define engine_type_e_UNUSED_51 51 @@ -882,6 +892,8 @@ #define engineMake_offset 1096 #define engineSnifferRpmThreshold_offset 4 #define engineType_offset 0 +#define ENUM_16_BITS 60000 +#define ENUM_32_BITS 2000000000 #define ERROR_BUFFER_SIZE 120 #define ET_BMW_M73_F 40 #define ET_CAMARO 35 @@ -1855,7 +1867,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 3536072872 +#define SIGNATURE_HASH 3208251651 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2323,7 +2335,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.10.24.all.3536072872" +#define TS_SIGNATURE "rusEFI 2021.10.24.all.3208251651" #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 7dad38f676..8fb4fa1b66 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.10.24 -#define SIGNATURE_HASH 3536072872 -#define TS_SIGNATURE "rusEFI 2021.10.24.all.3536072872" +#define SIGNATURE_HASH 3208251651 +#define TS_SIGNATURE "rusEFI 2021.10.24.all.3208251651" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index a088ce35d0..56415d7e4d 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.10.24 -#define SIGNATURE_HASH 3536072872 -#define TS_SIGNATURE "rusEFI 2021.10.24.atlas.3536072872" +#define SIGNATURE_HASH 3208251651 +#define TS_SIGNATURE "rusEFI 2021.10.24.atlas.3208251651" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 80110b232b..8d2eabbc56 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.10.24 -#define SIGNATURE_HASH 3536072872 -#define TS_SIGNATURE "rusEFI 2021.10.24.f429-discovery.3536072872" +#define SIGNATURE_HASH 3208251651 +#define TS_SIGNATURE "rusEFI 2021.10.24.f429-discovery.3208251651" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 262cc1407e..48ca773898 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.10.24 -#define SIGNATURE_HASH 2834720065 -#define TS_SIGNATURE "rusEFI 2021.10.24.frankenso_na6.2834720065" +#define SIGNATURE_HASH 3305659626 +#define TS_SIGNATURE "rusEFI 2021.10.24.frankenso_na6.3305659626" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index b2a0568e23..1b8556e6be 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen-nb1 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 2109112168 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen-nb1.2109112168" +#define SIGNATURE_HASH 273172163 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen-nb1.273172163" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index d36fc51463..7cd3e251cd 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.10.24 -#define SIGNATURE_HASH 1496672490 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen121nissan.1496672490" +#define SIGNATURE_HASH 885739841 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen121nissan.885739841" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index d707909219..5283109248 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.10.24 -#define SIGNATURE_HASH 2166935790 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen121vag.2166935790" +#define SIGNATURE_HASH 3973507397 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen121vag.3973507397" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index ab81c5f4e9..a69061d232 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.10.24 -#define SIGNATURE_HASH 79964280 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen128.79964280" +#define SIGNATURE_HASH 1765413331 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen128.1765413331" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 4af00324fe..3c52d68d6f 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen154hyundai #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 2528876178 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen154hyundai.2528876178" +#define SIGNATURE_HASH 4215648057 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen154hyundai.4215648057" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index f8d9db1410..60abae4cde 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.10.24 -#define SIGNATURE_HASH 3025227919 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen72.3025227919" +#define SIGNATURE_HASH 3652151588 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen72.3652151588" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 223a17521b..2e1edcc7bc 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen88bmw #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 608488517 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen88bmw.608488517" +#define SIGNATURE_HASH 1236989422 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen88bmw.1236989422" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 66e096899a..55fd02c3b3 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.10.24 -#define SIGNATURE_HASH 604920132 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellenNA6.604920132" +#define SIGNATURE_HASH 1240490223 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellenNA6.1240490223" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 472aac4593..13cacdb824 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.10.24 -#define SIGNATURE_HASH 2428038008 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen_cypress.2428038008" +#define SIGNATURE_HASH 4249277139 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen_cypress.4249277139" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index def156bc4c..d362a4c8f9 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.10.24 -#define SIGNATURE_HASH 1864181636 -#define TS_SIGNATURE "rusEFI 2021.10.24.kin.1864181636" +#define SIGNATURE_HASH 48438831 +#define TS_SIGNATURE "rusEFI 2021.10.24.kin.48438831" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 4674655291..9c01a332fd 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.10.24 -#define SIGNATURE_HASH 1515464508 -#define TS_SIGNATURE "rusEFI 2021.10.24.mre_f4.1515464508" +#define SIGNATURE_HASH 933895831 +#define TS_SIGNATURE "rusEFI 2021.10.24.mre_f4.933895831" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 4be17b48c5..d00054b62a 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.10.24 -#define SIGNATURE_HASH 1515464508 -#define TS_SIGNATURE "rusEFI 2021.10.24.mre_f7.1515464508" +#define SIGNATURE_HASH 933895831 +#define TS_SIGNATURE "rusEFI 2021.10.24.mre_f7.933895831" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 773031c90a..fa92a3d70f 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.10.24 -#define SIGNATURE_HASH 2184112462 -#define TS_SIGNATURE "rusEFI 2021.10.24.prometheus_405.2184112462" +#define SIGNATURE_HASH 4023439589 +#define TS_SIGNATURE "rusEFI 2021.10.24.prometheus_405.4023439589" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 42511f1d59..71fad89db4 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.10.24 -#define SIGNATURE_HASH 2184112462 -#define TS_SIGNATURE "rusEFI 2021.10.24.prometheus_469.2184112462" +#define SIGNATURE_HASH 4023439589 +#define TS_SIGNATURE "rusEFI 2021.10.24.prometheus_469.4023439589" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 3885191c90..92116c1f66 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.10.24 -#define SIGNATURE_HASH 4018668229 -#define TS_SIGNATURE "rusEFI 2021.10.24.proteus_f4.4018668229" +#define SIGNATURE_HASH 2188786542 +#define TS_SIGNATURE "rusEFI 2021.10.24.proteus_f4.2188786542" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d43a2e32f1..2d1d4ee16c 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.10.24 -#define SIGNATURE_HASH 4018668229 -#define TS_SIGNATURE "rusEFI 2021.10.24.proteus_f7.4018668229" +#define SIGNATURE_HASH 2188786542 +#define TS_SIGNATURE "rusEFI 2021.10.24.proteus_f7.2188786542" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index b7b0cb9b98..de1017007b 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.10.24 -#define SIGNATURE_HASH 1196350411 -#define TS_SIGNATURE "rusEFI 2021.10.24.subaru_eg33_f7.1196350411" +#define SIGNATURE_HASH 716235360 +#define TS_SIGNATURE "rusEFI 2021.10.24.subaru_eg33_f7.716235360" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 9bce839dd081becf8789e551ab9c7887ef654cb3..880abfd2b739ef65f658ae87b90e484889276692 100644 GIT binary patch delta 663972 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�-Jt?pGg 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°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∋Id0N5zwvEF#Wc5pl zM85d3uCi9MT7u#@=N3VO_`|`zV-OM{A5*47co4^%L*T+$93hQXEZd5q$zGR@g$xddffld zKJ6CleoT}r%bBGMTkl`XIj9R;7WqHH$Q_^ZKbPYqwY1XX#qFjN|GVvftY{Pq!Xzg* z90i=sDr5L zG$7G{L<15HNHiePfJ6fl4M;Q~(SSq)5)DW+AklzC0}>5LG$7G{L<15HNHiePfJ6fl z4M;Q~(SSq)5)DW+AklzC0}>5LG$7G{L<15HNHiePfJ6fl4M;Q~(SSq)5)DW+AklzC z0}>5LG$7G{L<15HNHiePfJ6fl4M;Q~(SSq)5)DW+AklzC0}>5LG$7G{L<15HNHieP zfJ6fl4M;Q~(SSq)5)DW+AklzC0}>5LG$7G{L<15HNHiePfJ6fl4M;Q~(SSq)5)DW+ zAklzC0}>5LG$7G{L<15HNHiePfJ6fl4M;Q~(f>Cj+W7xZB>FGP%#=hsK#!N?yhe|i zbfX@d_+N_oe~{?^;LXREIOhL^N(-6~lVWa=iog=Yvm5~2) zWlR|cRT8xgI!@9#4leCK_o)6WLt7Fi`Bve|;Otz<(0|u|W$3GLbuDGmaXl{kzZH0B z;Guzs1|AxCXyBoNhXx)Rcxd3Efrkbj8hB{np@D}69vXOP;Guzs1|AxCXyBoNhXx)R zcxd3Efrkbj8hB{np@D}69vXOP;Guzs1|AxCXyBoNhXx)Rcxd3Efrkbj8hB{np@D}6 z9vXOP;Guzs1|AxCXyBoNhXx)Rcxd3Efrkbj8hB{np@D}69vXOP;Guzs1|AxCXyBoN zhXx)Rcxd3Efrkbj8hB{np@D}69vXOP;Guzs1|AxCXyBoNhXx)Rcxd3Efrkbj8hB{n zp@D}69vXOP;Guzs1|AxCXyBoNhXx)Rcxd3Efrkbj8hB{np@D}69vXOP;Guzs1|AxC zXyBoNhXx+{e~pL!D>Kt2{i(+#{VPNNV>JJjp|7?aOXKPP%QG9?#ZyECoph1HM4H`6P(4aws1`QfCXwaZRg9Z&6G-%MEL4yVj8Z>Coph1HM4H`6P z(4aws1`QfCXwaZRg9Z&6G-%MEL4yVj8Z>Coph1HM4H`6P(4aws1`QfCXwaZRg9Z&6 zG-%MEL4yVj8Z>Coph1HM4H`6P(4aws1`QfCXwaZRg9Z&6G-%MEL4yVj8Z>Coph1HM z4H`6P(4aws1`QfCXwaZRg9Z&6G-%MEL4yVj8Z>Coph1HM4H`6P(4aws1`QfCXwaZR zg9Z&6G-%MEL4yVj8Z>Coph1HM4H`6P(4aws1`QfCXwaZRg9Z&6G-%MEL4yVj8Z>Co zph1HM4H`6P(4ay8uW8VKeP*eD?d87)^i|M#j<5M|`1Blq5eMZe#0TLk{TtST@MVzy z6S!XEi~bw_8qn5+N!+KHlt~MM1ROX&t`O+I>n{S0a#gQ{Xv!pMF#@)KD-h5?Km!2{ z1T+xPKtKZl4Foh0&_F-~0SyE+5YRwC0|5;LG!W20Km!2{1T+xPKtKZl4Foh0&_F-~ z0SyE+5YRwC0|5;LG!W20Km!2{1T+xPKtKZl4Foh0&_F-~0SyE+5YRwC0|5;LG!W20 zKm!2{1T+xPKtKZl4Foh0&_F-~0SyE+5YRwC0|5;LG!W20Km!2{1T+xPKtKZl4Foh0 z&_F-~0SyE+5YRwC0|5;LG!W20Km!2{1T+xPKtKZl4Foh0&_F-~0SyE+5YRwC0|5;L zG!W20Km!2{1T+xPKtKZl4Foh0&_F-~0SyE+5YRwC0|5;LG!W20Km!2{1T+xPKtKZl z4FvT68Ug(e&y1dwx=T-*bfX@d_+N_ouLym$uLX^WGD)|IK=R+3(L|7r`5(sl&KCmJ ze?$Bif_upS2{WAp;{S%fEVM0QQcM{JWs)~N8hO%79~4rY<0~8b@A|I|eYIu3`fAIe zCn4*<6>Mm*p}~d*8yakAu%W?*1{)e|Xt1Hdh6WoNY-q5d!G;DK8f<8=p}~d*8yakA zu%W?*1{)e|Xt1Hdh6WoNY-q5d!G;DK8f<8=p}~d*8yakAu%W?*1{)e|Xt1Hdh6WoN zY-q5d!G;DK8f<8=p}~d*8yakAu%W?*1{)e|Xt1Hdh6WoNY-q5d!G;DK8f<8=p}~d* z8yakAu%W?*1{)e|Xt1Hdh6WoNY-q5d!G;DK8f<8=p}~d*8yakAu%W?*1{)e|Xt1Hd zh6WoNY-q5d!G;DK8f<8=p}~d*8yakAu%W?*1{)e|Xt1Hdh6WoNY-q5d!G;DK8f<8= zp}~d*8yakAu%W?*1{?Z+&4&Jejb{AcgzWzU%zs7btGfG#(B$8scR^^4fpQhDsA%1P z!wqzzd&p?Eg!)=Z4_MGBl3rpEG5p*An$UKHN$TDt*OF+%sB1Pu~2NYEfbg9Hr{G)T}OL4yPh5;REAAVGr!4H7g+ z&>%sB1Pu~2NYEfbg9Hr{G)T}OL4yPh5;REAAVGr!4H7g+&>%sB1Pu~2NYEfbg9Hr{ z^#9Y|orhOdp9vhlTlVEHA;}H7x#vbSge^-UY_e~PbqP&zf}>a}f+z%xAd8G>tCmvh zXlZ@bqR8-QpV1a^)By{m!37aoTCMYlQ`v^GS`dgJ!y?Q4&N&x7oBW%9zC6$2f&0Gi z@BDu6J?s7Fg9MEPjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZ zjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZ zjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZjRcJZ zjRf6k67&U`dEvT9v7|QSM6C+5$w8}>IYXjXTLZsd66={AP=TXkqE}f1MccAT0dX3rD(kV`P*BHhFU&fXS&d{!*aN$ zBq^u9(k|7f5L7<2xutz*m9S$?aZ)Cq(JpZ$;6&p@<3!^`<3!^`<3!^`<3!^`<3!^` z<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^` z<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^` z<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^` z<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^`<3!^` z<3!^`<3!^`cbXG@0clnSbBUxjr1IsNdAaf2OvOQ)TbhGb35tUrZ4JOc!$8A8 z!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8 z!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8 z!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8 z!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8 z!$8A8!$8A8!$8A8!$8A8!$8A8!$8A8!$5Z$18w5WW3BeGi9f4=!k@3Q1WfZ;eXh*s zVV2L=nap!*SPHwv%Vp`_lB(PsWjvc(+IUvcmg;!<@@dYiK6iU* zKWlW?@8S)?z=h}|E%xZFm*b7!L{)7!Is0ndHhlcG_|Jl&)^Kx^#A`$KvU7brV%@=n zyGs*(eFu@>tKBb~U#eN7CNn+PV5Udr<||>^+|t6d3MgTExHSMQ4J-{T4J-{T4J-{T z4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T z4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T z4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T z4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T4J-{T z4J-{T4J-{T4J-{T4J-{T4J_Shu(XLXSID1&smg)^UzP=DHc4rfph)Rqa$P7@=twYC zX-h&zN#BN=g;QqDocMkFP^K_#W?pA?o()$zpaRdWkB_znOi)?{6evB|8Za&Cd10wM zSQeM@14B`{Z*ia~H>^}?b4#nzDkb-hvcc8>sx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!J zsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!J zsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!J zsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!J zsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!Jsx+!J zsx+!Jsx+!}r>W8=&pgCxFPob51-H4TqwG>kRCZ)$CIc$CxTCDW^7%Sbd!8Sbk`-MC z=f;%rY;I}eSp{aV>N?OGz<9=Z#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf z#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf z#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf z#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf z#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf#(2hf?lj|B z*~<@9mfKKf(|A^a`BmkkEhw|eJFCzCx2n9aEW&fNQU=37uFQ4>cU{P3J%d8li8&{08xuqFr6)4NE7;O!}IKw!@IKw!@IKw!@ zIKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@ zIKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@ zIKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@ zIKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@IKw!@ zIKw!@IKw!@IKw!@IKw!@IKw!18sn_&oVi=<--+Kmf$** za=s@lO9m##=5|$-v$>@yXBF5#G&$NDfO3X%hH{2-hH{2-hH{2-hH{2-hH{2-hH{2- zhH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2- zhH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2- zhH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2- zhH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2-hH{2- zhH{2-?lj6-*~)%YSHKN&D zlD4wxTawQh<7I74He1J=u{9a@hwceCH_49L&>(4hHyN?SW#_xet@`f%ZCi4f<#XMX zp77$j%kS2%o*uX%EPwh+OUQG(v;oOoo90ew{H{OH#n;7`ot^EwK@Hvd>!X{-F7f$h zz96S}X=7vV9GS3NO9amNWcF^Yq23*DZt|%=0sSxaXMiuq{D<-P>5NPn{I1qVUZ^TB zD9-R@xyxnJc`e~@m63b2TG!rh49m<86)u*Qd$ju6y^aOkXj_2a*WI@BxpH0~(_JJZ z_G*csHXuv<>ob$GH<*fgWj(91{BhZ|R~uXB9;CVHlhL~?y8C^;%An8J&$j31$4T2> zt(V-iPm6esykwv1=!h%j>3v!cSNx{1>{RjK?qgYUZlk723qt;bw?kFqL`|d8675}4la(F?uk@%}Msd&sI>AaqF;9s(3?PZ}l3BRf3NuNVn zp;zj{{VMg{htjEA_p7CQ40u4#x@~E;yws+qcjTwph5bCHH$|=PgIP~Jaw6pOy{HbT zTHES!`sK*x?x8M^w`+w)cj`WMbVslM=E(N@`q=7Q21(5)+GSF=TMNhBr4so>eLdRi zdQ$&-cf7gju?M$(_)3<~_kZ1ezVWu9lWoS-G)eUih2_!eP_}IUL@Vp+P2-_%=wzx)_xi!Z)f!x!PS$|h8J^xOQytG-XkVjT%QP-kw3CkZ2a?B7r}eC-v-9Mo+cJ{os-0O=!*atvRMx0h^Q5swWf^DE zA;*fRI#%4nw&K;V=Sjzgyx#grs~$UyTkHj&Q5KRaRSx5 zvznV$e6{kUUg-OXW+FkMf>Y*?Cd^h(D z`YyE%^W>;}S<#YFCbP%p7kaH|T3Ff-s<{q2oG<>&P`P=GbT~RT&C#(c+fL+|4EHGJ{`J0|IXhDI@$qL2w)2KkSLt4UXxNFqs!396Irfz$v zAfjJT+ymSDQfZrV_`w4CK|EAq9!AdE>0v26toHQVx$}vY%raPKaZQDbB zfBE@gbu)5T$qqGkVEt=)JbeUtB-I{K6Zntc7s_>Qg`@NZx^tSF#yq<%(Ni5igVhD4 zzisy~zhPANmX0IpY;xDi(m*N^XnafRI<%gy_zd$d96T~REa7!psT@A9#p_Nu8Zg7r z0Q=4O+Ie!IL#v6otIWIcsV~EFa6veIH}=R{_J!)e(Nkf0FBEBz-Ct;BUSs7PRatNO zB6`*+{Rs0I$+-K@49L?*)!o+_zg^vZ)fid1Ya+f`t+&eV^ICQNDaTT8cP!O@mQ8yl zvV3!X7l{l@8uwmzwLE%EedmRJm$&B^>uFi$mBSQ7mEJ%-y9% ztAlsVi^&fb#d_%7^T;u}JY$i3al+DNk36Hx2Y+PdUFfnq?_yn^@_=4FB<8LXqsz}f zsK?V?b|+n|%Y%L*?I%^2omDMiIeAijfggNFUOufAEpIPPKQ;N{)XFNYS zv($x8e~k*1&ys^*X$^HjN9SfcI@jAa$0e=Oct-0Rb61(~R<%d<_@(AWz$59%IW@sP zC%P;@SCN#)`vYdQm&a6Ar3t6*T_MTO*bD55X+B6M_LMAdza;+krP^I>+@6Ei++2Dg zFMX|cXZ~tuDiOS5YU%Pw)g@BqPbKQzIn7P~H7!xsPu-uFcJcY_&v+kB|GG3HPxw>$ zF?YS}3#py_=ngY;d~Ha*j%BE~SC7ob43&A?Y%_D``nYlQd*tbN{@`Edl*)bcORMzn z!kIJI>~f$r@pv#*UzhJ_@Z5_w`29+m5=_;`+*Rgt&%LYkc>1}=ouv0Pu;6*A45fy9 z?)lr>nf-!Z)z|E#dt|+n6_N_2YRwLMWT*~S_+QpX=_VH%=#geTI)z@5_cBsFUF)0| zmV(SwMPPE7_y>lH;bP&2mv{$PKWeRP|w%}LeN6+70cS6P2`uzwkc z{w#&L>dSCf$(8IQP6O0-8PA%6&@qFv3bj7+sh-+KRg|E#BczMNT_`rrQpE7HFM diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 374f43be1a..d35a8b1e9f 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.all.3536072872" + signature = "rusEFI 2021.10.24.all.3208251651" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.all.3536072872" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.all.3208251651" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:21 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index f378ae754a..dbf0d2a37a 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.atlas.3536072872" + signature = "rusEFI 2021.10.24.atlas.3208251651" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.atlas.3536072872" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.atlas.3208251651" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:18 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 2dc96cd0e4..8486dc0c5d 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.f429-discovery.3536072872" + signature = "rusEFI 2021.10.24.f429-discovery.3208251651" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.f429-discovery.3536072872" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.f429-discovery.3208251651" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:58:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:06:43 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index e19ed389f2..f23dcecf53 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.frankenso_na6.2834720065" + signature = "rusEFI 2021.10.24.frankenso_na6.3305659626" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.frankenso_na6.2834720065" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.frankenso_na6.3305659626" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:07 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 5f9d40405b..ca75d7f31b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellen-nb1.2109112168" + signature = "rusEFI 2021.10.24.hellen-nb1.273172163" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellen-nb1.2109112168" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellen-nb1.273172163" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:06:59 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 9b66fa0a0d..66de811bc4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellen121nissan.1496672490" + signature = "rusEFI 2021.10.24.hellen121nissan.885739841" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellen121nissan.1496672490" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellen121nissan.885739841" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:00 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:06:50 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index cc4d6e0e95..554396c4b3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellen121vag.2166935790" + signature = "rusEFI 2021.10.24.hellen121vag.3973507397" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellen121vag.2166935790" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellen121vag.3973507397" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:58:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:06:47 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 9ec6bc912e..c9f212cce4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellen128.79964280" + signature = "rusEFI 2021.10.24.hellen128.1765413331" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellen128.79964280" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellen128.1765413331" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:58:54 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:06:45 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 54faaffb78..a1237d9297 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellen154hyundai.2528876178" + signature = "rusEFI 2021.10.24.hellen154hyundai.4215648057" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellen154hyundai.2528876178" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellen154hyundai.4215648057" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:03 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:06:52 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 619d70fabd..8a4645bd1c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellen72.3025227919" + signature = "rusEFI 2021.10.24.hellen72.3652151588" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellen72.3025227919" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellen72.3652151588" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:06:56 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index d7f5a62068..6d6091f2ad 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellen88bmw.608488517" + signature = "rusEFI 2021.10.24.hellen88bmw.1236989422" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellen88bmw.608488517" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellen88bmw.1236989422" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:06:54 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 4fa6c8c2fa..489bc81fbb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellenNA6.604920132" + signature = "rusEFI 2021.10.24.hellenNA6.1240490223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellenNA6.604920132" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellenNA6.1240490223" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:01 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index eec3c3b17d..52a58ba172 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.hellen_cypress.2428038008" + signature = "rusEFI 2021.10.24.hellen_cypress.4249277139" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.hellen_cypress.2428038008" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.hellen_cypress.4249277139" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Oct 24 01:59:50 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Oct 24 03:07:25 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index d59eb77636..e19457a5ea 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.kin.1864181636" + signature = "rusEFI 2021.10.24.kin.48438831" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.kin.1864181636" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.kin.48438831" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Oct 24 01:59:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Oct 24 03:07:23 UTC 2021 pageSize = 19972 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 8a85f112b0..7fe4be11d6 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.mre_f4.1515464508" + signature = "rusEFI 2021.10.24.mre_f4.933895831" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.mre_f4.1515464508" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.mre_f4.933895831" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:05 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 44438ea091..0cf406251d 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.mre_f7.1515464508" + signature = "rusEFI 2021.10.24.mre_f7.933895831" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.mre_f7.1515464508" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.mre_f7.933895831" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:03 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 6095619ebd..f73ec7c4bb 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.prometheus_405.2184112462" + signature = "rusEFI 2021.10.24.prometheus_405.4023439589" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.prometheus_405.2184112462" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.prometheus_405.4023439589" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:32 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:12 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 9944ca9d8f..c52d5a758d 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.prometheus_469.2184112462" + signature = "rusEFI 2021.10.24.prometheus_469.4023439589" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.prometheus_469.2184112462" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.prometheus_469.4023439589" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:10 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 7955a4234e..4473df12d7 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.proteus_f4.4018668229" + signature = "rusEFI 2021.10.24.proteus_f4.2188786542" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.proteus_f4.4018668229" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.proteus_f4.2188786542" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:16 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 7ab660a027..c1f538ef6e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.proteus_f7.4018668229" + signature = "rusEFI 2021.10.24.proteus_f7.2188786542" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.proteus_f7.4018668229" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.proteus_f7.2188786542" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:14 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 9ee3183914..7282c84dd1 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.10.24.subaru_eg33_f7.1196350411" + signature = "rusEFI 2021.10.24.subaru_eg33_f7.716235360" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.10.24.subaru_eg33_f7.1196350411" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.10.24.subaru_eg33_f7.716235360" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,11 +85,11 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:52 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 Sun Oct 24 03:07:26 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "INVALID", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "INVALID", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "INVALID", "HELLEN_NB2_36", "INVALID", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "INVALID", "HELLEN_154_HYUNDAI_COUPE_BK2", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "UNUSED5", "NISSAN_PRIMERA", "UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "UNUSED25", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "UNUSED96", "UNUSED97", "UNUSED98", "UNUSED99", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 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 c559420a48..d9139e0e1e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 01:59:44 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 03:07:21 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -750,6 +750,9 @@ public class Fields { public static final int engine_type_e_FRANKENSO_QA_ENGINE = 49; public static final int engine_type_e_GY6_139QMB = 8; public static final int engine_type_e_HELLEN72_ETB = 33; + public static final int engine_type_e_HELLEN_121_NISSAN_8_CYL = 85; + public static final int engine_type_e_HELLEN_121_NISSAN_ALMERA_N16 = 87; + public static final int engine_type_e_HELLEN_NB1_36 = 94; public static final int engine_type_e_HONDA_600 = 43; public static final int engine_type_e_HONDA_ACCORD_CD_DIP = 18; public static final int engine_type_e_HONDA_ACCORD_CD_TWO_WIRES = 17; @@ -783,6 +786,13 @@ public class Fields { public static final int engine_type_e_TLE8888_BENCH_ENGINE = 59; public static final int engine_type_e_TOYOTA_2JZ_GTE_VVTi = 44; public static final int engine_type_e_TOYOTA_JZS147 = 38; + public static final int engine_type_e_UNUSED10 = 10; + public static final int engine_type_e_UNUSED25 = 25; + public static final int engine_type_e_UNUSED5 = 4; + public static final int engine_type_e_UNUSED96 = 96; + public static final int engine_type_e_UNUSED97 = 97; + public static final int engine_type_e_UNUSED98 = 98; + public static final int engine_type_e_UNUSED99 = 99; public static final int engine_type_e_UNUSED_48 = 48; public static final int engine_type_e_UNUSED_50 = 50; public static final int engine_type_e_UNUSED_51 = 51; @@ -795,6 +805,8 @@ public class Fields { public static final int engineMake_offset = 1096; public static final int engineSnifferRpmThreshold_offset = 4; public static final int engineType_offset = 0; + public static final int ENUM_16_BITS = 60000; + public static final int ENUM_32_BITS = 2000000000; public static final int ERROR_BUFFER_SIZE = 120; public static final int ET_BMW_M73_F = 40; public static final int ET_CAMARO = 35; @@ -2091,7 +2103,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.10.24.all.3536072872"; + public static final String TS_SIGNATURE = "rusEFI 2021.10.24.all.3208251651"; 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 224064c3de..b81f619491 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +