From 29f321a9aab50a502c5f4a4ae6410abf2cd0aae8 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 22 Dec 2020 15:07:32 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 7 +++---- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 7 +++---- ...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 | 7 +++---- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_frankenso_na6.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 ++-- firmware/tunerstudio/generated/cache.zip | Bin 980915 -> 980835 bytes firmware/tunerstudio/generated/rusefi.ini | 8 ++++---- .../generated/rusefi_frankenso_na6.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 ++++---- .../com/rusefi/config/generated/Fields.java | 5 ++--- java_console/rusefi.xml | 2 +- 33 files changed, 82 insertions(+), 86 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 2eed93cacb..49183b0272 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 22 12:26:02 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 22 15:07:08 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,4 @@ struct persistent_config_s { typedef struct persistent_config_s 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 Tue Dec 22 12:26:02 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 22 15:07:08 UTC 2020 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 6689636664..876ae8c1a1 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 @@ -382,7 +382,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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE" #define engineChartSize_offset 1480 #define engineCode_offset 1128 #define engineConfiguration_offset 0 @@ -424,7 +424,6 @@ #define ET_PROTEUS_BMW_M73 63 #define ET_PROTEUS_MIATA_NB2 67 #define ET_PROTEUS_QC_TEST_BOARD 42 -#define ET_ROVER_V8 10 #define ET_SACHS 29 #define ET_VW_ABA 32 #define ET_VW_B6 62 @@ -1230,7 +1229,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.12.22 -#define SIGNATURE_HASH 832017350 +#define SIGNATURE_HASH 2013371550 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1561,7 +1560,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.22.hellen_cypress.832017350" +#define TS_SIGNATURE "rusEFI 2020.12.22.hellen_cypress.2013371550" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 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 e1ce3e25ee..00e4b25326 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 22 12:25:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 22 15:07:07 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 22 12:25:55 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 22 15:07:07 UTC 2020 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 fb66d15e45..112519c100 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -382,7 +382,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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE" #define engineChartSize_offset 1480 #define engineCode_offset 1128 #define engineConfiguration_offset 0 @@ -424,7 +424,6 @@ #define ET_PROTEUS_BMW_M73 63 #define ET_PROTEUS_MIATA_NB2 67 #define ET_PROTEUS_QC_TEST_BOARD 42 -#define ET_ROVER_V8 10 #define ET_SACHS 29 #define ET_VW_ABA 32 #define ET_VW_B6 62 @@ -1230,7 +1229,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.12.22 -#define SIGNATURE_HASH 1619765564 +#define SIGNATURE_HASH 689808996 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1561,7 +1560,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.22.kin.1619765564" +#define TS_SIGNATURE "rusEFI 2020.12.22.kin.689808996" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 3bb2bfcc3c..545502f1aa 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 12:25:39 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:54 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3782,4 +3782,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 12:25:39 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:54 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 5c43789aa7..f11802abc6 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 Tue Dec 22 12:25:39 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:54 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 51e370de51..63f784813a 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 Tue Dec 22 12:25:39 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:54 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index c81dc36570..a6428db1da 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 Tue Dec 22 12:25:39 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:54 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 48e6a804d1..b22426ac4d 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 Tue Dec 22 12:25:39 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:54 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 041ad6924e..2b665f94ff 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -382,7 +382,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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE" #define engineChartSize_offset 1480 #define engineCode_offset 1128 #define engineConfiguration_offset 0 @@ -424,7 +424,6 @@ #define ET_PROTEUS_BMW_M73 63 #define ET_PROTEUS_MIATA_NB2 67 #define ET_PROTEUS_QC_TEST_BOARD 42 -#define ET_ROVER_V8 10 #define ET_SACHS 29 #define ET_VW_ABA 32 #define ET_VW_B6 62 @@ -1230,7 +1229,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.12.22 -#define SIGNATURE_HASH 4167447813 +#define SIGNATURE_HASH 2985310813 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1561,7 +1560,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.12.22.all.4167447813" +#define TS_SIGNATURE "rusEFI 2020.12.22.all.2985310813" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 74925dc05f..50b554136b 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 2020.12.22 -#define SIGNATURE_HASH 4167447813 -#define TS_SIGNATURE "rusEFI 2020.12.22.all.4167447813" +#define SIGNATURE_HASH 2985310813 +#define TS_SIGNATURE "rusEFI 2020.12.22.all.2985310813" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 347285adb3..99e6602fb9 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 2020.12.22 -#define SIGNATURE_HASH 1846969598 -#define TS_SIGNATURE "rusEFI 2020.12.22.frankenso_na6.1846969598" +#define SIGNATURE_HASH 662735782 +#define TS_SIGNATURE "rusEFI 2020.12.22.frankenso_na6.662735782" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index c9d69e686e..ca48f069ec 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 2020.12.22 -#define SIGNATURE_HASH 832017350 -#define TS_SIGNATURE "rusEFI 2020.12.22.hellen_cypress.832017350" +#define SIGNATURE_HASH 2013371550 +#define TS_SIGNATURE "rusEFI 2020.12.22.hellen_cypress.2013371550" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index a6ecf6e52b..7c82cad340 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 2020.12.22 -#define SIGNATURE_HASH 1619765564 -#define TS_SIGNATURE "rusEFI 2020.12.22.kin.1619765564" +#define SIGNATURE_HASH 689808996 +#define TS_SIGNATURE "rusEFI 2020.12.22.kin.689808996" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 34f7bffac1..59ef37a24c 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 2020.12.22 -#define SIGNATURE_HASH 4021742460 -#define TS_SIGNATURE "rusEFI 2020.12.22.mre_f4.4021742460" +#define SIGNATURE_HASH 2787173412 +#define TS_SIGNATURE "rusEFI 2020.12.22.mre_f4.2787173412" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 13b85ab03e..e893c55ee5 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 2020.12.22 -#define SIGNATURE_HASH 4021742460 -#define TS_SIGNATURE "rusEFI 2020.12.22.mre_f7.4021742460" +#define SIGNATURE_HASH 2787173412 +#define TS_SIGNATURE "rusEFI 2020.12.22.mre_f7.2787173412" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 2a2abf4db2..bf96457674 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 2020.12.22 -#define SIGNATURE_HASH 3133027156 -#define TS_SIGNATURE "rusEFI 2020.12.22.prometheus_405.3133027156" +#define SIGNATURE_HASH 4079500300 +#define TS_SIGNATURE "rusEFI 2020.12.22.prometheus_405.4079500300" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 2fbf81ddd0..f1e56f4522 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 2020.12.22 -#define SIGNATURE_HASH 3133027156 -#define TS_SIGNATURE "rusEFI 2020.12.22.prometheus_469.3133027156" +#define SIGNATURE_HASH 4079500300 +#define TS_SIGNATURE "rusEFI 2020.12.22.prometheus_469.4079500300" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 1114e1ec4e..4910874f77 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 2020.12.22 -#define SIGNATURE_HASH 835485659 -#define TS_SIGNATURE "rusEFI 2020.12.22.proteus_f4.835485659" +#define SIGNATURE_HASH 2019192963 +#define TS_SIGNATURE "rusEFI 2020.12.22.proteus_f4.2019192963" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index e84414816a..127cb8294c 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 2020.12.22 -#define SIGNATURE_HASH 835485659 -#define TS_SIGNATURE "rusEFI 2020.12.22.proteus_f7.835485659" +#define SIGNATURE_HASH 2019192963 +#define TS_SIGNATURE "rusEFI 2020.12.22.proteus_f7.2019192963" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index e3781061cf769e950e1228fe4c390f5b17d52383..87e1ddc2d736f8c93f60a54aec8d52636e04cdae 100644 GIT binary patch delta 224132 zcmV(!K;^%)?>pn}JAi}%gaU*Ev;-;&5!-l{QF2v03DZsd;}Jk&*=^f z4h;YYj|<{oj|<{oj|<|rPb~(M9Dg2})E+dueb_KV%Qnh2u0FbLbI+mk;d=98pzjU% zcKgw-H|pp*RQm{}zb$8|{iA)XuV>NX)lu0!)7P>&AjqAwn_paa*{UTf zKXh;FXNGrIJ^iHOBDL(4HWY6-ly2MG($91ZDbgF=*3anUc-Ze=>PSo^qkk8?AJS;o*T0rw4FDmb9$1H)V27?F?1zVI>9%cKhsT*|YaCjKjxmhVnd%viG0IFV zqbc<{ZP2RNTXQrVeedVjLGx8La-m1?_RT;p3hS_(mzuV5Xq4vf=-5o;vWFu@nzw51%ND3v)n)q#qY&_x) zKpnzUJED%q;0s`kaN<7|7x#<5CqXjv|90htD{uA#o65Ral8t<|daX};Xo4(04MK|W z(_hSo_dwNSaFd!aw2e7Qgkl-_%5Q}(j9o6~dJ8$#ZMP{-?ddJe&3{ZF>@`!r3-I?* zSWCnIiQABwC`|_7A!}X9s7iUf2!C)NjAwq)8jnBB1K@$tsovNc14|G9CAuU-b_-Hg z2@G0;Ez%#+pU&Nf*!ml~xp1l{Cr8J}w)H=(ceBxl`{nna!`wt};`~9(d=@Ro{-hI5R)6G2q(+~~zSc|p`s%3{ zOzfJ-d+RSp0Fm+4%DYG(XT`1ZixK8WpVe5A7U zA&76hR`3u^{7LP7M{KE^x<%E>i;+hecH^pfV?6|3%J@&H=<@H@jYn>I?jmwcWR;8M z2lA*xW~wM9C4V2H*8eIOte{9iNS>{k4<*paF(Z;nrD%T+$sdsaw1`CLmnlXz@&Yz8 zwU3^xI}dj)v`2mr03SiIBa)Zuy}FE7l@lH#KN-1z0o>#h8WE^NS#56x2&a*{@nw;>2Gp zj6zvysyPqp`FD+(jPQ0&;E_w9FQ3boWPVtsv;ZZ=jZNbn4=-e|~GrBW? z0_a9c?KL2PNfUN66$cVidd$ z(A8Yh5?3-;@hk2Xq%Sd{ibKv9Zvt&YJsHvXc$UAA z&jz!h+;0hwBrrMm{%j#i>%0?r@PI>MAGp5F1L&;ZTBN|RkEOn!;7!rCnSVI2k8yJy zuhnxOEKY!v!gCl0WLXarU>1K4NkRvwBpy?Eyx?(zXBHnhwS5t1Md$lkQNxRK{^D=y-BY}t!(bJnvb(R%Jnse=p7Wt_cJEnuiM1K}aF^B%Gz=0hT zSX+of#9=KbDJJ(~wf)O2$ivRAeJLYSl>iQbTF~wJniHk0!jho_1kFJvIQc6Dt6H!Q z3)WG=Ixbiz1@gIRL%QwcYYiEynQL%lx+en#P6IqD+-Qj|@$NCkbl0^}jv*f1vg^1N z_)wM~j$I(^+(WnO9)GzGdd!mvkPkkV;nQInB|xh_*Q1m<7!@3hE(UlK&|;_TgYrS; zz~M&+9?SA8yzpZcUJldOW6T5}ss~4UxvDG)wQ&)VMn3?5nR+0<%G}3T3)QBYu2L0; zP{q-~F@HKFc&ZWvyL51(pnw`&0ml)%+6emzq}UD=L10;j41ZJcnLbh~X2bjv?6T~R z?NGI4%za4k*_eJJK|i8us|b}Gth5uys)HgA=Fa+-Sxd*JY;0ML{-(v3nRI^b;+uJ) zi_hOb$+P*HI&7WR<%BG%2S=fvEof#K$TTuf%4i*@kwgue`$PM^D z-fPr@rNyKkeyPtE_uj#^sg#%zgljEtQOI<3S$G!MR2HsRhOBmdb{8#yRMMPhCPJSK zd1@IzoVfD;Tp{nAJf|*OWMQeTUDQH9kc<#xKfDM!Du43t4>Y%GGys{0c#J+mQ36}d|DFgG!hf<9^|{M#pWiFzu;gcN;*SF|S5Ug} zN;pp|3`LJ`VaX8VsfN(%;02S@KcMvV(dS;GwSwp`?b-k)6BC)Dq*#Ls%L|_$ zz30E@@dYWWQ_6`d;0WVC*;TotnAH&MsWMyfCJ(3%Cp02SCSYzRSsbV=IM^(~d-9}_ zo`1AQKBBOv67}%jisdC(oaH|gf<*D31n=f99+VG7x733{NvaSv8=Z0HA}dAT6Y5qg zlRgpt(rJEDXNScICttD*M(C?H2IQ4#S-vwSFxtRXg~Ng<1x9@$>+v;T#ql#VI4|Zv zV=)Uf5)(x0QL!K7`x5ySV~@XUc6-RV#D6f>GjI8QG1DP|XH;RtNWkxs-}%RgnGS0) zTiwyd#!reaE--73MTN_2%FR;VNyPfK&lnN>PONL%CmeqqKSsQp{HJ>lrVuIyURvyD zeMIqQRxVV-d5;m~)d=DBRd<$EfAsYb2rBm|K`sDF4R zZ#y7y$(1OS$aCn;+3oKXMbZ0vW@&!owbSCf;$G%nCK6IWVG&{`fq%`u70_vI0wqNO zY{{rW#Fgiv!(n2Bo_BOVB`t6O(Q};D*r-fce~GslFuBS1#dMCSR|r328gUjX%b^@- zwdD+p>@8IwlHLm2q@ajb)MA!Int!ktqcy^G%XBs4YB)o)`{GP61*g-p9Uy1O#bONAdS�b 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 delta 224164 zcmV(xK6n%<>6n%<>9wKEe4Yuf1bA7J-5d?u8<|#gJ!o6`)Fv{MsHErY2D9zu|-QCn)+l^G+$D}PkTl(m9fmWP)u>iw%K}q*IOl#lvS8D@!Jr& zdqgRKQG^3`#3+x!7eFN8#D6L-?iYVgf@J3Z?aB*R-s}gqpmnh%+x}|xTA%jNGFf~Y zgcSIvznBm2f!N2GCpBSz8*`F~&@%FsI}2S#yIjom7ILcFe{O1=n%P^L_nAPLai;DV z;P0a_qK5wy6CyKFnvBasM!b@Lm124k72!S@&-|h_9)Fkzz#5~ky|Fb0P9XpSbxHQ^ z7No2a7_;Z#pfj*gFQ>wj49W}^@H%kMvjxryAw_aA^9uclc_ zHemIWqZ7)*e_3k#<9Qh$aCoxL)e7VcirqoMYGbLuCimOFStBn=F1@>Ev|N(70cORW z0_)_e(VTgA)@A*iCd~XQea1p+O=mOKW=xYBE01rl0IW90I~8;ZGV+s0-w)GSq)S1x zGh|mW=s$+69b?U##0F5Rsq;CVTS!-tYGrQ^qvZtge_6B~`;$&MS&@5@8hs|STQBkJ ztEXNtv1=mlt-l-rM8;P$tCO46$;(>K&05aOTFK3-zLJ5rNUDh&oAE#4+XH|5AhxUV zk;>ACAinWh!9y_dC$;w-v88V67F8?nOCDu3j;rR4^$>WeJYYgamw&fzJo46a7m>#z zt6VHUe~_acvR*~uDY+K4{#UtR1x1QY@@&m~D1p9@8Ie>fMf-C|Zi4)$MI<7^Ofle* z7qIQAee`7AdAMt#J#vo#_y~#}kr-9))n&Y@obVX=$;br^;3kiei#>?}fn2taoYDyg zX@Tzt_?>UKEJ!G9f9VDXSYImm4g(8A-wejE@?p=4@g+S?g+Xu^ zV{93ZJ!C*;@@W&G6LypXvG7P#CG|U$GmLw0{G}#SJM4B0jxX65@5>QP0UQf>Ki(5( z3*8^n;Lwq?^zT+Pa(GcfHvqQ3B9BQ|UUCo6O8*uGy2QWo7KO9mN#+JrumGe>eh)7F2Y(iK!nS^3*Rtai zC;nm~zZ1LSIzT5oM{8e>*S?%&zm!XBU+h90xWZF@A@nAme5oND#YW}mzzaR=f3rv! zx1WfaCt}Q{ff|+XxJ7)0`T^|L1B0fKCys(;6P|!m82AMXC4w>Ce2ch(Pz-p=x)M4u zMT5R9(d`h>FYH|;kA49L$|)=QMTf(Cs=Ys3QFH-@V#gM}r`NQoH%WR8Ez($k6+euk zOQM<3qYf!KOk~mzq;{YHv;Imde+?n}Bf#(m>`w-WD%iz!3d0l&M+3^63q~wJpP$*9 z(aQl8K<{b`@_Y8z4FYtVZ`Id^ZLJR%!QK7WcLHzP{=8n0_}I2pKlXARD=Ei2LR61| zq~L9U9_W&mxT(2{Uvb?aU5p709rDSdp#Z4sh6vv&Ay45;k#e=jPm|1ueR-?Vjq zUAdxs^R7Ym2iETL&gUDp_aEsrQVxsWu}7n^M<*>(fOzoBs1~q&C(CH@J;tPhj&# zC+#vU&p8=6KPqZG$zI+~e<$i`oMM=*dk?nyVnE5CL;4ipm%6-?6KEUi$wa$&@WU2h!EC3 zflc9SOPf+HbT33sf7VEEOu8a#0LAt>v~FTw>0*%sP>lU@V10qUXr*OJZ66Y{05MyJ z!U<-}vZ0uMgHC$OFN6*HLaV16TEcNqGYV#?LHE(4@OJ~uifeJTAWD#F8UT(JQ+TsV zg$BB3PC0#BzucBj+9mg!m*FGT2}F#Dp5AP#v#dDMoZDzLf7DN%+c6z9CbCe9IrMJ@ zj`x_r+Cmf}4r@6{F?k)U?O$#|9(H!^OBs=>1aJt{g5J>Ad@E)3m<-h*Xbv*L$zLg0 z)q-_cu#O7Waltw%kSk6b(rqVSnaI%CT!SOiJsCf68sJgkMoaXRcaNc`yRMCL4Dsle zUB|7!hqC-|f9wKb=N`IM_sDh7k)BL|eDJXhpAOUD0b2FBj;74PsNi69VY-?ETI`g4 zP(G*}IQ;0qV_ANM7k;e5%VGL@jG5p=_25V^SCu89HZCI4=m+30QxD`Q?9}o82m|103W7%JM5Ef=^+lJBL7p&Hf?N0uaAm ze@O1^l#n)N3EvcDZAowhgrX$L1kBAOivyJfe+Qc- zcu$@*QlIw7brkkgq8{E`vAhI}v;1d5kSP9>;N9HCgYu#1mU=KKNfo(fqmRy9WTohP zLfvX*(kH@SI?Yd7?ywl)l1!m2$sPKeMxmn6PiCFFS83TpiiFHl;gu{~K$B1{6|8(!c6hg(o zON;%ik0{>E%0(;_jGf9Xt_qI15;rC6+nw(#?=i5v8ev{|!qNq}d{2cnf7Pg!orEAV zHWjbrZ3iSSxe`Sfc@Difdjp=LD0+X-EX{Acc3PZQ+{@g{L_!KEEJDmA@UPjo0{XH| zprj~(Eg3b4aPvHLI81Ek^N#MPq+t#qdJexD867(pzD&e-sq)idxK)NE2pcv__b2nXYDB4adL0swe4I1@?UGiLeQ; zn`YUyyIC~yX2RPxp-{OH=|$bW45I~*i{8X)`lzaFy&JZg-_tb=`)$YTD-m^(O1*gEGBB@n1|^D}D~g_hIlmdkbe5?jk@0)JxTd{vCVOeW4gff1H3)pTpu$Vf4sh zC&)Q3!cX3FaU^v&e`1bE#KJTO=4I)k4+OuDTO0C2tpdaIFu9_KE^kCb&S;I2$#|29 zON*w3az-Jf;P{{&G#urNxMef)r_*2@pw!}hAG`TsoPNR~ATv`XUKN*WvC`M>H5*0i zER9XfQpLBA5X5SoH7~Q!ng>!!&XXfAF$VM8+tPLS~Bxh&0j+ zc+bJ?XhB#+#D+!0F2bnNCP=2!7eJX#|9DvBxCq%Yv7Wd9#Qf_E97xwNMj2|XB+)T( zs=Vw|+tzmg&c*NF^J+A*7OXGx5BD!lowHGV=Y?)K8oyw8h^B;*@MAA*s&DJ(`xbH1 zzqIOB{}YK=e;QXGiQ;lfj(D}&Y;Kq*DGb@Xsio$d1OIC`PP~2X$Ug)B5VY^rY4Eazy7 ze+zSj%3*l=1~pbJQg`R0X!2YT zFe5a1E0xW4IhBAL!n8ZT_BKO0t@ZZ zEJDbKr4K}oln*&7%mpe8Se5rq<-N^SCh=+%#P@-jn!efZ<+}!*^sB(lp`97#f1|si z_u1G5di{lp_@T@Eb0i_J#gI%GEx(qL>Y(Hbl76Xg%K6@Lj93zQ_U zj|-pW>3jjT!pr2YT#*knwX9QWe;vK2LHH4fJj*^lz*|CU{$reG)L z=!{krwArcu!|ffX^Ycqpv|FJ`>-%BwWK}A%A$~tROq=GO|76(?&n6Z<63fWZKp)(G z5_5j2cSsR}hoW%RxIIiIPsUc+E$&jz_BuV?dy}auk>s@g9r4~9)c-(1e>O+3z4E)E z-}0VIwM{9uNCC{7Lk>eK7S}LJycz8i zzP7LJGYh*B&*DQh!-Hw{4S11$YmNFX?iz{}A5y9gJz&8;491!}txa*J_JK{Mh12WU z;@1(sW$|l}mHCfwjv9>$f32XwB52Vk%`wj^#M!A<>{l3(XUjUTC~KbYb8l)K?n2XS z%0!7|o>>5ecYaM3E48LcrjRUgwXm+Aayj62`)`x`6X!nwcsm}y&LI6ztEnt2ntM+a zLJx32%fG9^E1+LI@nA_yNeqy7^6CYnNUcV!3rr5Sg3M*k=a6Kff21OXg4q4mnzsvs zFwjGkzgY|1@oTew<#w)nH^aeN_*idFayg)Qn%e>psaQBh8Frm2sHEe;qq`Co9M{J(?`hWc6mb&LK_binXx zSW=|=24+T|5}cpC4F4iIfL=b|R?|XNDrSMzpcS{koZwjMrX%*rt(AF>v~F5;(jrAK zy;%Lj&!MD`-JwV`{Ubs;`L-R$e}LE5y-KFZy&x3wh8*YN z87R=>;(Hn7)1r^GUCHVYb{^MY9i*PRP*xPp@Rm}@B!yj!?=5G~7Smls{{efk)&CBV zOp)M9rSfq@eR`9cPa>lx9SY*UB`!)>5$P-xsgG_%lSUNSj2lK-8~da*lh|~m6^KJ; zbCv=8V5*fje>qwUJT*B!NMPLukvZiPty#OaInBwWiA$i|Ql$Nrb+m~(*5)|VxYzd5 zQ!YdkBDq&;eBC8)&Pr_8hUO^3NR@4O>6UMU??GAbLd{|6r-k?8JlZ-}?c~$~8NQ+( z75s7Ohu)lS#>7E3kla*%G3UjXP0(FbVp)ubEZu6-f87o$!g$XV{d2L5CaW=Du2XTy z1Nk)xRkn7Rs#v)6B)h-wH6+AqVBpWDgCvmpHP*Y36>nnnn6>cYn5-k{WS8>`l~CYh zJ|dmG|<7GGp~@Y>r>qh8CmT_Bz*D3MAFFLB;KC$@A;Z#)5)o;&OQ#POqAG zTwbQMe;ScT-zq|A=`Q093A8=(5+k)FBpNXkA;>l4iB^Z+?!2TAq^>NxQxZp1lo~Al!7QEwSodKPOStfk5LiMQMBqa z+7Y8!5PpeC84eGZ5io4UJm@yGzHw%!o;IoGe>ixI!}HEYpitpcD|)0XbkdEzWz3p7 zo;(YaNOs2;vREo6$PSKXEA8!p{(THH5O^xKcvGS2+)m_W)Ou{VZ#F=e6R53>Ut68? zPOm%6?xaa@7bHjnC8&iMk>YU^_(*pDnhTb%NG?e?;5n1CfgVTEg%7RJIzj4)Y;xUu zfBHt$5k?d=4=&8njLib$IL&PEyTEIe?c-`S))-#nu)|Q*LIyf`4##LqWK@vX`;>cb zajIn`E6hH6hLa!7STM+atfAjAj6}xY^_U&!Z=l@Le*=v-zWtWo>}X|uM4^jCQ_9zZz_kvBQ*`6789df^w5 z14y0QEtHO(5;@tL(4zOND%yMF-$jz3_ld72!6Pt(1?yv@Td>;aU0@oNLvXz6e-j9?qKpnB*T8^{Jh;~F-ab|A!s6!mIzX1eHRPiTQlBp z@Fd>&zDplA;d>*;hC?_A`{;2b$9q1xKw#9F!Kq$2d{P+I3k88-Wl^se_Kj>ynQd?F zv{`2&MUR!t&``_q#>hLgQEOXif8I?dw6pNUoFM1fX-U;jb_G%Y(4+-`UPOR}==n=@ zZlg02PPNKT%!RgyW2%e1|D*IpQg`%^sDpb4OG2U&vd@>hSt**UY;@~O*89cJ;m@!I zfchT+`-Nmd_%=y3fLVMM``-a<5BsKP`jY7qe;o$2&EF0KTHHR9!;M|xfA}0KCj&Sh z>}B9(-~x?B%pV(?Y<3#*Ck&3!e(t!K?f+>*vZn!s%4Qdf>0*Fp2SR=rt3n4($qWQw zl#v$oTZ?fyy1z|UAxa`vlOP)S=tYDy(a@W}G?*R^FV$tt$XiWNDG~NpqZe;Q{iO_( zCoI^aIf-`wLek`{z5h{4e~D8iQ*>f5duDt0#QQ?(!szm1Og5XO$sMAHhC4WaJ)yx! zdat$pW`AF8L`~GnfRx2PwKJ5iMCXIf)y-uc{Won!=?0fwYkO!?Lr&p$tU?9DjP*EaUeTLK^F!M+&qPr*I?t{2-c4N=+f4E29_=_;j7IhJR zjg?M5a^nILQco?u$n~>95LyCAb*(&3>Z?Zw5qy?Mw<70W5%|~Mav41eqi)CI1fF#z z2_e5bEbGvjgS^8~tD3aZqe&ONsj%l2mu-wDE>iP$-baToFEd}u@+&(Gl1^xZ#Zo*` zZl>aixcsE6ucJz3e^il0+0xo{dLz>=m`&IpVJO6iAtW}LbmA?igm1VA#&y1_ znn<3HQ!dAo!FcKWq4*@cbO|RsHN9>zB2A=B=%B_+VIbY%f6#)O$N-Z0AKU_G9o&Mz zYDGX+OW$BXpQs|Kb1?lYw?{@N>By7QATh3_qC`GDXv?MCwoqAORYDeLl8qGXe7tU2 zT3SpNO`9qvCrxpp*CYh7MY$Ac17wyRF}bFLGckYLl9*QN_sUO-b8JnJ@v40+bzdd9i@V z-(1gI;`L-3eV_qnh-aJZ2V^d%@weNr4hkJzJ$aNs5o zTdxf#w=FxGK&-JgHL^U24!I&ZVz-b$=jcF+Y3ltPo~0-FTW zIYr8!UdYBrTWHE!=(f_vGjw5iyRmv++Su?#9!Oz!%a(BinK{q zoGR$9;85I2xl9-T-qia;TRu4Qp^R!{lFwwRQ7SVTwD1&|;EtjQJW^_co=AXPe+pRK z8gKNmrZ}^bSW%`tR_D*f)qjq}UUxXQe%Ve01nuLNc9)%Z=boFDmPS|TF(?fN;kr$c z|6G*srBX`4o1rM_S-NM-f<|LA&~ypNu14sFB6_AaSwjM;&I!3&Jy0G|6=ElZzV{~Q zhKc|iB+;U=N)pyaFexWryDO5Of79mP0yb`Ah3C*E^oEQ$i22?!hfbv+l`2!wN-$~p z!mlqnG+e}~Um4x6;CgMg;MKJX1u-eOwGamgaKm52k8l=L~NYaL`o zEJhjcX-gSdMEEX6e>!Qm*|ANE*h;dLKMhC*;EzRrVR|H4tK>RYQe80Mf9rQvau!or z+h+i`iDqCxG_j1KFT}JNIic*anh#1=g3wS-pdCkh{lJPtbXy@sG2%Q$o`?LlPRNrM z9N**+fa81u-Iy!MHk-~9hkIj9ke!Fg&7(SvTRU+lXs3Yw^1P+6T-0!&hM8Ve1Crjm z@U+7ij%a%cGv%nttsDE$e?+nJ-)ppu-eekh@hnLdO41X6>Japys}F#6mOTdEyxG4+ zzdh_^?o9?X_FDIb?}Lm=UxZ6$t)=QR^Wbhtgl42709*fo$KD8WCR_V00$O!AvzhR~ zkYwkF2&R<$Fu{-_Lj`9O993CP(x%#+O|_Lbf>u_QttaKyHlEDof9(+}33(%{2}6X= z4q$gF53v@k_0>!|R}_rBGBW!d5}IeTOW*~lnhuo0lN2{Fmo^*zXY`EzW52LVgLS}U zdOfE%GOe+>SaWkyi<3;s1${xlad!hB<&Ax6KqM6e(KbpM5J?+Mfl|n}gTp=2BOm z%(YWsoBhtP)2v^*y?**t-J+ zp@Nn4``y0VxH&r`Y4tB{47&@!i5?5m4XC4O1o-gu^tOG`XVsydqYp!F_Ox;W$rT_`?Q76%uRSNbsvLkudtG4Asb+vdqTI{&_4)8(d(Ao7P3Gby zBrddCgz7(Ge{q!2!lw6yYSrrqd-K*S~T zq9RQcYGh_I?BI*hGML<9=!wo$-Vz||Bm+uZ9Ec3;6B|9-$UBEDZ$si})ejcp>e45U z9Kf!X*S|NSNDBDb6SLs&8qc)S^a4#Uyp3c1OD7B?3`}y_6qiI8LE>UH_rgAKcbG#2 zl8{30e`(UW3xS&_a`wtYrP0;I*9V~>-LIfwQR?uBC?mXJK?Q_p3Q6>3v5aWNk$^+E zbQ-Ugcx5Lej1U4UT2?BroKu(?%lG1d-CE;SZ$U`?$hRPRfoBIg!oDU%DJ@iT6N_tX zP4+2VN@Q=4Lb}AGJG`zVwW{P54~cG1jt)n*e{J063;>IxQZbo98FxRow?h&QBh4so zJ02d893Vf{LJ&!-tm(}m^MFX6+MS>GS&IL|cs2LCBY{t1$=59Lz9xCrr1#`99tk6H ziv%>&uz7_SCk^}wXV2+ZW#w+8xmRETrNL;6CyUqy;QOGjm*Y>cHJx~2) z)QR@k#jnBLju1g<>b>tjDt#O&wU>gTJnlDBoR1r9BmqCky;CcCZR(j}C08ZX{Np^|q-VP% zXzz`r8jUUr4>yX07O{5dkS7lUOf;x>p_ERg{dX-HA+GUk(XsOVej()_5CTci<+f?P zNP=&H6^J@)U_;G$pT$(laWGd!b|8$7lBTdeGJ4-O)U&N~CF+^PFV5=|3W-I;BY9c2_{)w$T(d%=##*c78O90z zTI7yNd9|Zdh3#G=CMIj8<|@&Ke+gKAF;q}Hx*WG4{RQXZn)lP6EB>GqJ19JYJ#n;t*XIB|@J(3=cL%-0rI z-WM1*!&_qG>SMt=CpxHk??1p1<0qfPe)}IcoqoH;%6m*ObwdjEm0xp{e?%Kb&6fik zYbEbouc%MFUVHOwg%>z>q+9`CyBv0nY)e0fx56PF*{$7s%EfLN{HJD^NEYdmhb(S| zDs$h5(NzasV6nTMH8vV(23OwN)HJC22GLiP~ z`_iW|(h&Q5Z_Ktf&?aXhe?z>NF`St!AC8X?OPlOw_@BtM$!aA{&c9DLD?x#2jditu zJuLqw$gFzOolP33-`Lb06Sc$1j(W0UYClTHVqXlt*)FZ!`f$4!{?eEKZNB$0FN>V7 zxL|U2yI|5OPXy_sf8j|c8MTj?ltM}>b&R3(p7>2B)nzBp9FbM|FMZP{$6Rbs1Q%u?`vN};2>^M=Gk}GV9 z>P1{O`LjV)*_B^lwLPh{C)^FP-*eW3Wg(+bFQcG7MJug?oL6nGgku1q6bAX`5LKLX z_Lx^V{~g8e-$tUs3JL1P-PGT1(~KprPN4KNNlRGu~(f~@YXSfc%n|d^^H)* zZ_yLBaLk6IDMJE`Bh)+g625J2_HHmn+t{~+G$R1Cl?=7}x!U_wTUolWr;r2WRFE8i zW28f&*|ETRB?t3ZHr4$Ez`SL1CM?JVtIiUYthytbmcVC2e`^yzs6ro?fW&f2J>qwx z7=6hA(eVr*;5$l0?L#)LvZ1P;+Ravtkh zBTaKQ*l~)qZe+oUsYN!O1q-Q~Ds@EX z!toy!Rv|aYfB&qqp-UT4==}DZpHN|-AI|c`!Ksc)x{{7zAr1WHLu4DDPvmFETz4h;y=;EB z<@bvD-I3p`d-~_9h~Wy9s@9sV9QsagrNZC^(Mn)28FY6Yi9qde>c^V)Ejlz`EiouEF)|5zL1IPpw}`XY z&Nkf34hZ&KSdJNKWs!Cz)X$7m-0^+?L20nBdHe|$thA*Z|K#0Bcw^>`Yoyf1R~~#h zlCAHdfA8yFu2OkDP-55q3OcJyP?7Umurtk&QEOh?L`4!4maYBlgPLwde>vlZh$&NP5|r8zXodo0PC&^(iI0LA#u*zu zi~AE*;gY3LM6-y{L&7^;j23djcugpDi|X*mFIp^VlI0VOxv8ZKV;pHtK^93edW9f| zWTYbzpHnZZ;5W@778KT#)C^c==j#xyt?pyFkUzq*lFH=f)j&EKx4X;(?W}b0e=)ll zaiQPOZgW>0R%e<*nBmc+Ayw+g;=aW^Rqee%GSWMxd9xNXaz`7SP)4V@iP?GqP>4LJ z!^jM4BDNRD7)rHY;jBTYnx8|#7eR4U--kVhYOL{n6eV)bV$q^bS-@(#$Fu{v=whFA z4MS)bqax2dy1T)cw-G<3y!+<8eZc!OjSwgfZ6Q1~hKqnrWyb7oUG^xBKUI$F_W*kz9XxelnQa__{_Uy3Ub?U={ z)x3m1NNCc)q7?*gUO8wfVzEzZ*-uVMQL1nn0#S7Z2hC7pS*9~DwF2Uq@>E=ex7gN| zI-1^!L3~##mJaM<>3a?Xe>8_7i3tsnDgX&N;nWW~>ItA5ICu_l@WeSe^OwSqwxQiV zO8P_RvF7MjS46#j-$A{?MKn|Fs|rpht}KYOC?QNhyZ)6_Ld7Afr1{$L07-FNaYuOl zTFL)h&HsFu|M@8Y^Kt&?libhcQvPRKx4idLdCnmC-Op;+zZm3Te@)XKsO=k+?sHJp z_oxm{v7&^+NP?z(oS6nvpjD2yO3?;ZiGs>%;xfbr2wnD=)ck%Bbk|q=Rn!Ywzm`hjK`b z`{A=R;3m18#4`s=pPc{#Lv~LJK2QD_T?G7H3$dUJ<1lQ>7q;;uVh1D2l3z|F3(zJ~ zL=IDqw_zSo_*>i|#=w!`xq2o=~2!a%3e+KD7`A)Nre;7A`v7AmXqeoVO+qQ%- zz;`tpN7$(50?52?t4GL78msx@wY6y5@sR}_Y$HYPsEse^g*txOO5;$gTigtiii*p-vM77*t!GDEtT?h%Im9?J~|P{2)6`%GXIIfA#CzmZJVuyoe2Y@ zfp@E04Q=)~e`S;AqJ(8lAM-^;S5jt>wtQm4rad8-^U~mGJF2c`y~lE2!l*tT`?ER* z=TkCDUK9g=9M{;hChOHQ%K1yhF4Jn+b)^XFEyY(4Fo^F8S%X)gnyY&6Ul_~KSpM3m z_i--!tStQ-`36SXttXrZH_)!Kw*RH)<$2zg$l2kFf1MX9MV!F(Z3uEM>tj`$ zad=zZkJtOD9i9p+XKNy7RCUORoDWGIEVCuhXaWDn8@1W5U;os(K6jfp{oA(Ktt#^M zBBn@+e@f&=Vihe6gdSWGBUuxo8ukXTy%9;}ZE$UmA4$^A*%carJM#6IG~^*Fc2qyj z`$P^qAJ;b8Qs-8MCxT!kk4neewIpP-kB^=|^j5X^Z2U{2CNeiASsh(GAftdL6GCM5 zMX2xxaU3j&U8e}Nbf-teAS$!t;U|La6|FT>f7K0LDa($q&gq(q+nP-AlTl4~SlRc2 znLG_->;ZKgyfO|#+G>6Tuy2dA_#W0 z&X@-NY$CKe&>0jueuu#{y_h;{F%9_ZJfL_htiX~py}0U}vO3lcFukYR8JP{~KrUkV ze=fPX7)q0m5U8KO6|L(iv4s1+?_P?#AYgn%v1LlOVvgeQuC9s4`budr8` zk!HEzEP6y&Rd|;P+1{jX{xg+u1vM=Fe;^%vu$#Fgib#sjQaHTzGU&6+;2+qf9Bj6^ zQRMzMwMrKNuWt4@Z8pbliv*sjw?$z_4kb#d30Gl5SyEftR)#T}c7=*dYdlLNg9-@ltiQn?5ZjZCgHh#l>=u$SS4&vDiiqf9iM? zdHfJa|9jLfK%{;q&Z(CUsPv>W!%)oUa6a+X-K9@HG2V}GKG9MaHKNe-qfiPXH;1UB z*}x1`=ePvWe>{qGs-?eL6I4DPlk%~U*or$u4)Co)!$KRKsdY1Gm;eG3 zLpOYSq|Sx}mbQ1CHaR69XGJU1e`DbpME3O@-QjKRY!Cd~fng6#6wl4CwU_i&k*v%zX5G!rGpAZSTz@WrOKGkLaosy$y?dcf6)a`IMLJHEac##u!}=O)kVZ zGis20z#Nab4M3pry2q0mKI+C_-0;-)oB60*J1Cv1c|LD}f^dm;f3EGnz-%d-6rDX` z*l!zNl9&p6qEp$B${A;!Jj$%Hxvc#1f1-m<99*T+fi$bn-Y7k5 z>OTtI*jRAZx^`ADM~~A2H?9`202sP0xTC7!4u#gdapM_Hm2d>4sTcH%oVhL7Bj0)e zuYyG*MwV`z^t-=|_@)s1G12^gkq#P%WY}LQ7k^t|EUY`J0?I(AO(=%m>PdwtsAcFY zarGkTs|{84e~qeS7=uji%g&%&a$1+d-=nzE13r?3`oc|`v0lT_~d7sbIL!39a`G%VrA4ibbvkp4kJ3 zbVyprM$G{D%cXZI1C*dhzJ&dw+P_Pw{1s`dD&*m8!BE} zmw@>7e|7k}36mX4>uUKlbEr~k&fKd9X=9zKK1z+l@=m|5+Kr3s8$iv}`IVsR+8*fD zs>yaYdYpv@u8*Zux{+2E!{Oy?11zMQ?vIZVwts!(aZ5_(ns@lQtH;zwJtpPu2dFRJ&^Xa!aE!s4f~q2FfIR9 ze^@Pmb-i{3)vV*e?}`^*o$`&Q=VuGf!`OO<^!xYX>`J47LWbKm>+BUjhccD|W?06g zF!}@PrlX>!xAZX<4SAf$cXFwX=OO#q&V;N{sl~m#fpyf#Y6FRpyLK5#v>F+YIX*DH zG@oY{hQvma^{?qTo7KHw0eyO!(>jiHf2J0A{g$z=pY{Lj!On5k?d<5SJ2xnX^JhoJ zz~%5&rkT#y*=F*ErR^MM-j6cx$C>vN^SxZ+g&mH@VohI<#^gmt;tGNFvw_VVBLJGS zIRcu~H#17+;msBY(`&&wO|!7IfL+R{Ftg5syYO4qd203XCu0_2bSA8<()ixOe^un> zO;5&WmmHE3?|0DXY*Q^VL0T5dBF4T?FWeg_)~J6vh=)0!~{}n3pY3 zr;Mw>`^9uY;_6M#iS-Q9%Risv?6_%_sGI8dfJEgjr>5g7jkLzAgv1XXyJ(9Dfj|{7 zeI;=NPa8@lV2L8#cvgG06#p z6q@wm$l2;zt?DAbB;E+ipCN>%0Oqk+$UIC)wq5Bl)C-9i0U2SB})yXc=F=a<=A<=trQ|>tIc>-!JDGq zxNxGMWxwRgCkf4ktp4}}mXSgzTSXo5aza|x@G&A!&eX&WTf~8-^Do1@u1Ffv5Fe#c)y4TPPtn8vhXMfS5YcNDUS1~lyOQYds}gxUAmiQFTW;xd8f)3 zNHL33@yx^S*4~px!qoWQdY4{{d=JOw+@A<@dcHlA-et&m=B2ZOJ!n+&nwR&410Q2V z;$11-Sn%|rf88C@vK9q_qjveoPhs0d|A3nZ+&6@|ng=nfzE1H#LR&dz4sAim3gZz9 zEJ<}gg) zQAwdFAHHyGN(toj&ZRkY6W5-8ZA6pgf&Pe{!?_Upwd5ogp58dGT`j)|#(> zTuIN>V6_}5;%@C|*-LL~gbGUP@l@DX?V`>?2Tz7*W^z}jn&mhv*L#rI^Cqa=RC!^z zHC2C%y)qbo(a3Bq;R@(v7F>|gl_kPEYhsG>!~gtW)dx~3xDyw4EZ4%Q0tc%_{DB_O z2NAB7e{pfWjUbM$v@M?mpK1K&hg1kRk5PZ9UD@@m3=V6JN;&a

NM@O5 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 R-q8Q#tRs<{Z&T@i`yXH9p@#qf diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index f62f09169f..195a787334 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.all.4167447813" + signature = "rusEFI 2020.12.22.all.2985310813" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.all.4167447813" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.all.2985310813" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:39 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:54 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 707be0d491..cfadabba38 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.frankenso_na6.1846969598" + signature = "rusEFI 2020.12.22.frankenso_na6.662735782" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.frankenso_na6.1846969598" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.frankenso_na6.662735782" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:45 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:59 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index ee88f97507..9f51205e0c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.hellen_cypress.832017350" + signature = "rusEFI 2020.12.22.hellen_cypress.2013371550" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.hellen_cypress.832017350" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.hellen_cypress.2013371550" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:26:02 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 22 15:07:08 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index dce15c9b02..b32fdb6e7a 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.kin.1619765564" + signature = "rusEFI 2020.12.22.kin.689808996" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.kin.1619765564" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.kin.689808996" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:55 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 22 15:07:07 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index c608c9f84a..a66ebfea2e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.mre_f4.4021742460" + signature = "rusEFI 2020.12.22.mre_f4.2787173412" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.mre_f4.4021742460" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.mre_f4.2787173412" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:43 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:57 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 001b539bd6..87c6828b0c 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.mre_f7.4021742460" + signature = "rusEFI 2020.12.22.mre_f7.2787173412" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.mre_f7.4021742460" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.mre_f7.2787173412" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:41 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:56 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 3ac5ccf81e..7317cc30fc 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.prometheus_405.3133027156" + signature = "rusEFI 2020.12.22.prometheus_405.4079500300" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.prometheus_405.3133027156" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.prometheus_405.4079500300" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:48 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:07:02 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 51e5d9dba4..24b8384a19 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.prometheus_469.3133027156" + signature = "rusEFI 2020.12.22.prometheus_469.4079500300" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.prometheus_469.3133027156" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.prometheus_469.4079500300" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:47 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:07:00 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 5ee4f16981..703cb51007 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.proteus_f4.835485659" + signature = "rusEFI 2020.12.22.proteus_f4.2019192963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.proteus_f4.835485659" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.proteus_f4.2019192963" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:52 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:07:05 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 1298279f26..72393f4bf1 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.12.22.proteus_f7.835485659" + signature = "rusEFI 2020.12.22.proteus_f7.2019192963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.proteus_f7.835485659" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.proteus_f7.2019192963" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,11 +74,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 Tue Dec 22 12:25:50 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:07:03 UTC 2020 pageSize = 20000 page = 1 - engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "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", "BMW_E34", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "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", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1.0, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1.0, 0, 0.0, 20.0, 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 5169016957..fbbb721441 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 12:25:39 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 15:06:54 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -406,7 +406,6 @@ public class Fields { public static final int ET_PROTEUS_BMW_M73 = 63; public static final int ET_PROTEUS_MIATA_NB2 = 67; public static final int ET_PROTEUS_QC_TEST_BOARD = 42; - public static final int ET_ROVER_V8 = 10; public static final int ET_SACHS = 29; public static final int ET_VW_ABA = 32; public static final int ET_VW_B6 = 62; @@ -1464,7 +1463,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.12.22.all.4167447813"; + public static final String TS_SIGNATURE = "rusEFI 2020.12.22.all.2985310813"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index b5b3c428e3..ac58aba82b 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +