From 6e62865f20b206ac7cdba951d3377c4a193ed4d3 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 22 Dec 2020 22:24:02 +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 980835 -> 980765 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 | 6 +++--- java_console/rusefi.xml | 2 +- 33 files changed, 83 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 49183b0272..0672872a5f 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 15:07:08 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 22:23:44 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 15:07:08 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 22:23:44 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 876ae8c1a1..6c57705616 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", "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 engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 @@ -404,7 +404,6 @@ #define ET_DODGE_NEON_2003_CRANK 46 #define ET_FORD_ASPIRE 3 #define ET_FORD_ESCORT_GT 14 -#define ET_FORD_FIESTA 4 #define ET_FORD_INLINE_6 7 #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NA6_VAF 57 @@ -1229,7 +1228,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.12.22 -#define SIGNATURE_HASH 2013371550 +#define SIGNATURE_HASH 3930481456 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1560,7 +1559,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.2013371550" +#define TS_SIGNATURE "rusEFI 2020.12.22.hellen_cypress.3930481456" #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 00e4b25326..cbab81f3e0 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 15:07:07 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 22:23:42 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 15:07:07 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 22:23:42 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 112519c100..120334d067 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", "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 engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 @@ -404,7 +404,6 @@ #define ET_DODGE_NEON_2003_CRANK 46 #define ET_FORD_ASPIRE 3 #define ET_FORD_ESCORT_GT 14 -#define ET_FORD_FIESTA 4 #define ET_FORD_INLINE_6 7 #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NA6_VAF 57 @@ -1229,7 +1228,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.12.22 -#define SIGNATURE_HASH 689808996 +#define SIGNATURE_HASH 3143260618 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1560,7 +1559,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.689808996" +#define TS_SIGNATURE "rusEFI 2020.12.22.kin.3143260618" #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 545502f1aa..26c580bfdc 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 15:06:54 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:20 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 15:06:54 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:20 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index f11802abc6..13b261c339 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 15:06:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:20 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 63f784813a..b25b73a74a 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 15:06:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:20 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 a6428db1da..eca02f2010 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 15:06:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:20 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 b22426ac4d..4295d485d6 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 15:06:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:20 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 2b665f94ff..f795419399 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", "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 engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 @@ -404,7 +404,6 @@ #define ET_DODGE_NEON_2003_CRANK 46 #define ET_FORD_ASPIRE 3 #define ET_FORD_ESCORT_GT 14 -#define ET_FORD_FIESTA 4 #define ET_FORD_INLINE_6 7 #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NA6_VAF 57 @@ -1229,7 +1228,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.12.22 -#define SIGNATURE_HASH 2985310813 +#define SIGNATURE_HASH 599246323 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1560,7 +1559,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.2985310813" +#define TS_SIGNATURE "rusEFI 2020.12.22.all.599246323" #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 50b554136b..b239db3676 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 2985310813 -#define TS_SIGNATURE "rusEFI 2020.12.22.all.2985310813" +#define SIGNATURE_HASH 599246323 +#define TS_SIGNATURE "rusEFI 2020.12.22.all.599246323" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 99e6602fb9..874ba43e52 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 662735782 -#define TS_SIGNATURE "rusEFI 2020.12.22.frankenso_na6.662735782" +#define SIGNATURE_HASH 3049747464 +#define TS_SIGNATURE "rusEFI 2020.12.22.frankenso_na6.3049747464" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index ca48f069ec..9bb7d3a230 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 2013371550 -#define TS_SIGNATURE "rusEFI 2020.12.22.hellen_cypress.2013371550" +#define SIGNATURE_HASH 3930481456 +#define TS_SIGNATURE "rusEFI 2020.12.22.hellen_cypress.3930481456" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 7c82cad340..a2a54dec23 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 689808996 -#define TS_SIGNATURE "rusEFI 2020.12.22.kin.689808996" +#define SIGNATURE_HASH 3143260618 +#define TS_SIGNATURE "rusEFI 2020.12.22.kin.3143260618" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 59ef37a24c..73a25506f2 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 2787173412 -#define TS_SIGNATURE "rusEFI 2020.12.22.mre_f4.2787173412" +#define SIGNATURE_HASH 879172490 +#define TS_SIGNATURE "rusEFI 2020.12.22.mre_f4.879172490" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index e893c55ee5..3c88cb2f2e 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 2787173412 -#define TS_SIGNATURE "rusEFI 2020.12.22.mre_f7.2787173412" +#define SIGNATURE_HASH 879172490 +#define TS_SIGNATURE "rusEFI 2020.12.22.mre_f7.879172490" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index bf96457674..c2b112d509 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 4079500300 -#define TS_SIGNATURE "rusEFI 2020.12.22.prometheus_405.4079500300" +#define SIGNATURE_HASH 1634714530 +#define TS_SIGNATURE "rusEFI 2020.12.22.prometheus_405.1634714530" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index f1e56f4522..c8cc080d2c 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 4079500300 -#define TS_SIGNATURE "rusEFI 2020.12.22.prometheus_469.4079500300" +#define SIGNATURE_HASH 1634714530 +#define TS_SIGNATURE "rusEFI 2020.12.22.prometheus_469.1634714530" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 4910874f77..1c5a0bcdb7 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 2019192963 -#define TS_SIGNATURE "rusEFI 2020.12.22.proteus_f4.2019192963" +#define SIGNATURE_HASH 3927805741 +#define TS_SIGNATURE "rusEFI 2020.12.22.proteus_f4.3927805741" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 127cb8294c..34eb35fcf4 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 2019192963 -#define TS_SIGNATURE "rusEFI 2020.12.22.proteus_f7.2019192963" +#define SIGNATURE_HASH 3927805741 +#define TS_SIGNATURE "rusEFI 2020.12.22.proteus_f7.3927805741" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 87e1ddc2d736f8c93f60a54aec8d52636e04cdae..08c361625492856ecbe184f66ab1031922b16b12 100644 GIT binary patch delta 223297 zcmV(%K;pmS?mM0CJAi}%gaU*Ev;-;&6zZ~;QQW2BH0yBy0OFAW0384k0GFW^0wN08 zapGUuapGUuakoA#27?@bbgnPaGwq>gXX<`v_~j-tSsvqx4n3EhnP=qkXI|ThZdxQQ1Aym#o=uWWw2-FD|ca z)e>VLy0`T+!-=b&eo}FfD0WI4iZ>iex9x4|XF4Jj>5XpdXLMzMJnVNbbzCKq(b?Uw zJ-|Is@3(XeAu^Cle=Wlr074KwunsrD4qZps4-ePUZQHgEk2BNOIJ6EOV;H5+)H57o z6pdI$Q|fctpjENA=4d$j7SFGP=BsMtLdW0jn}J*u)?qm>HErY2D9zu|f0@W>89+8W zFh}iccX(6&5k{+jnpgEdn)+l^G~ZCd?|Mekl(Dq7Q0#EXw$^%n*IOl#ls%X=@!Jr& zbwm+>A%sJA#1N0c7eEZ*#D6L-?iYVgf@J3Z?aB*R-s}gqh;^|f+wyAlTA%jN(pY>N zgcQi9znBm2fq2IlCN*JC8*`F~xH9sUdkS6Vx?Ifl7ILb8+ip6Xn$269H<>_~Wv1>G z;P0a_iiZCaQz0`^nvAnUM!Aw7m11`h<={RT&-|h_9)Fkz!0Mv!ystb4m8< z7No2a7_wj49W}^@H%kMvjxryAw_aA_~uBKT^ zHel(KqZ7)1!&z$k<9Qh$aCoxL(hB6clRNF-tdW-_m)>17S}sX^0JGvw zffaJqXwJMl>#}}M6J~yuK42lWrn3!eGp0#_l?S(109Kph9SOSl82QPg?}zCu(j_0- z4YKPO^an%Mi?QY%Vgo4E)R~-4{imx)wX(N|(Qkr(_$*qE{YfXBtjJwRjXskZt(W-q z)l)B+*fo*&)?bbQBIB!>)yd83k7^U&&xwB-O+X%=n-1?Sa325Zl%G zNM-3m5Z`#M;31g!liK@^*ituji>j6PACEG+##QsidI-Ffzn@Ui<=?FvkG${PMdX3V zDi_Ot59Bz9tWi-IO0Gh!|5YwnL6KsOJXyyfZx98^}EJY&Eh@~18Dx*yPP--3Py(sNE6&3(=zaMe7ROb}JEMRqJ|r!9i9 zVgLg4&rQM7*v$>i0dE|coB%_t+LWy^*npQG2a~3^oP6{sfLhI17t8f^(SPl__#9q; zM$wnpngw5c3zo!^qQayXo6w=v-F-pk7qQ4Fc9#mK!@$DOH-j;(eAu&Md`a(8VG!KK z7%RqOj~9@ceAEQ!R2}6yEDRD=Nqr6F+~VFFf2qmT4!aS9<4ZQi`*H+R0LKE}clX5E zLifQmICSJJ{kzqSoLQ(ScNEL)!5goCR&$bGQB^Z?WFY(;v}xB)xDj|qVJ&+)Fj4@b z0Pv^r4S?;h$OF=qm)rxi(qBb^F6FPhMd2)XlDPpDECA_}AA?K(!JoyQu&p21we0xB ziN9FL@5Fw%4$#TY(b|{ewJ#^xFXhtO7rPJ#uJC+c2)&6XUuwt}v5`1B`7Gka z?I&X3iI{O|;6>#NZV_MMeLuVDz#wSkS)*XtgeTw>27bXp313V%*&x_sC5 zNxR(2b2diKjEWjhvX^&%bBTHvrx-Tt-h-{a7*O)(kUjuyi4Q4}m*%FRNU~=yL*+P`oc_(tz0f)jqaDAHx&{@BnNP%I0S4w?9!3&{nGjU)a z;BP-;_+w12@_e4!rR67 zzE2TYaL;?eEdCslAP!DRJf`q?!Q%$cEIx8-`y!l*Q1QX;(I4dT)n(8Z^z+mJB80U` zU{me-R6Jxm?SYMzoT4|Y5+lPcKK+Kk* zaDv&gY-pw5pp)M63t@x4(9-FKmT&~rjDi_z#C`NAoZSGk;#yoSh!SL)27qHl6W**+ zL4od#Q%>L3FRSH~c4__QW%x)H0udvkr#GAGEGv#Q=XM!?4ewKDbxa41i7b?24*gq! z<2NR-wh)Dg!&**KOkTul`dF0 zwO}0PsRhB26$As(Gor1-D4=}u4|(lLp-`= z*KsTGp)5at9J@f+xrc7mJ#rm%j3*NyAABssr^7TDfL493<0x}5DmWNjjN>Gr#ZK7= z<%7zB!;cO;mgQG?;m0bx9Hy_wmEJ{`0X4V+jw5)r5%v>*NU7^dPgeWX;(hWRDf zW!W9up=!&R`;g$XG5th>eniz)5h^)YX(x_V2Spytopm9zmX1x?*s>b^O^Yux>HONo zH}l>Wr(f(`{*@S3$Cp6nOXrf4fT=CozwTscz6+X)Yso1Xx`Ik@JM4i2|V&& z*zgi|SSU_ba^||fx7LUxQadsMy$7a}Zt^uQlaS*DO5*NW`cD;3kx3z~XiO z(h`D>Bw~l;LQL@#MF`z^b$7?1YlYsi*{$L_z(GEsEWc7B_!MTka|l!z>>n~M0P*X8 zh2)-2329@N@J&(HmPB_xs(~Pt5rt#FXpA%E(FX|&M;Iwj_uGo(Rsi$J3q!c_My7#; zPb*>+S)!#XDT)d7C;K`uMmvCN?v@cyMlkYH7L=y4D%x5LNJLSEL|KF)q}bCk|D-bYgqx+yJr``3nr(3KfyZ=%S*60%YP;WiQ+#A-pyS+C?AS$sRx6SRFP;l`rOP#R*JqS z)U8$~eIop&)BL2h4vP^^zGNAU&?RjQ$Sc#bd}mBxw1KM%hXqjzjQT{@<7+O7<7a4a zUd(~UViss5CWzLfVn4{mCGshM#vXsy?DmjziD9f~-tzlmrb7bHsKSVmfZrwe@{bWS z9oAyDx}%MapA=nOVAdRq3eVP*o29&yh}CGHG4S`DSl6^qILtVHjCeQsPxl^7Ayf>! zwAj!3h~mwxT*NZL*s09os$iEZaZ|#++WEfn9s|Xz5$1&_ELVWb_f(jFQjJ>KNeCii zP4PZNI?;=sKqRaG+`D-YlP{R>1xK+a6AjFdXjEcV9&>%2!rst zX_j5Pn?)mUCcI}83Y80yUew*oFj@e)=uNDqkE*xUyJ4&OJzc}FA9lRH5>a&N1V96_ z9^FMfC{rpF|HZVm;^%OD9|pg(_iuK|E&@J4y;N=J-?5k67m9Iz1PLhhIV}DZMvoju zf}HIl{NxQ6M^bm&C+3JmEKGA?UY0KUK=AvxwIM&$Dlj|`lPh}Y@xm0M%)h?CfpiUHl%d8-5*-t# z%F8~rRecBGT>Sn$uSO$l!TK`)aR1`eIUB`yUg(CS@e788Xc`y^zx2XJ`nG<)ZxJW` zORH}6Kaq%krE&F33Ne+3fQ5+7uq*NDm_p3`3i7bg7ryO4reo~Qgz(5AR8WWSH;X;gNUwFzn~#EjyA|-MU75o4%G&|DV3+aXQ<7{> zaV8KmPU*l%X3s_I3Rwe`XCDZ+v9cJdC_JaWVWoHp#qCAwg)R!0w2LM1AfgUT@&rXA zgUSOIQ4ar^Wn&(tnbM$Ur*SRGzy+)|@G3qd6wCj9QmGsrm$XOL4_b_;$JL{XG3uFi z#48Pdw1NdAU_-wEAMXGOk)P~MpM+RIGhn0%3*$NX%l$p0GI%+o=Nb#>Ut2@gJ|?SfP-Dd+b$33BCeH;y zuJI}?T8h1=EApODAWG}V*pJdVuC-vC;)`W}H1=b*&_aw&ZW!(}=dwJm$H8*EB5e`F zu|Yu)A8gbd(kUNJSqUI@>rh}?p1Cx5oHIR-nJ79~yuhGfm^mekGCe{06)DN^rS7Jl zs6M1hKr<|r+M*fY7gdBK5BNqD<#~7=E6=bvVhMwk2r+xNlu|PQa(zl2V@gG|4`WV$ zQ!O*;s3K+_U0pLraLO-PAykhu?^5re2}B1<-(Ui~0g!2^qX=8;EWn@@mr)$o-j|9t zckM2UCc38EN<;&E+APiy_G1NQNu~}S4o)UuM-g=E!?mjM7=z$-TyZTgOFH*hqwmplyFYmDEchgeEvk=_RX;Ff z^hss|SZZR`;{_aR_}YpluvxBsm|QgeAVkNQzOFqt@R{t-@Bt`06q@wer2+XFu+YxT zB7}Tc`atAJ`H-W$T%f{$ReA4J-rHPd60b%@#p>6`stzH87)KMC9%+KpjKB=>r`Ac@HI!*6l~VO})hdO2|nbkNse?Buu>y;uy%;-V)=XpgkinXAhS1 z<1beEL%G6{P(0yos81)=Pdswg<-pRr*lhHzLw4&R4ZzkCt+DbZQT||C@t0t+KuPlY zxbRt?&KFQCyiD%O75P9@%Q~fh*3o+!gdc&(v+Uyoyd|XOKX!UKYeEo1DC$t9KK;mn z%VWOGE?E5951 zE$_Kh+mvF96u{hF7;`#g&GRr?5H>bNc#^3Ws=QKOB5^eOnn6M^w0{X=h50CH(yQP6MZj`jnRACh>9xG}z3TG0KN zp=L@OU+#FQ5HOEYAP>UvY&G#UHW=@o-lG1fw|ssp5kvv6J%TI<*zB#h3`q1(p#r6R zGYa*qjIrnkURn)*yREMEm%~FC73BnHn)+PW;!t6eKLr=c|4aB(sGs#;x9I;whYGKT zB}J-lU}p3w!TH(C@Gp`B=;iZmH7)d{Vis5pT5$`^367<1I%1#PTAAla>!wvFEmHK- zo0ZOZH_aIdu=a0 zBRNT&%JiqR2EGTFuE|<6A^s0Hs zMnJOgYLnbhn7zDTqQ+D=6^d)Jl-@7!~0hMXNre z9Wj~(;g^_{;qY)70mD|zgKk6X8)tUvX_IPyj)TWIJnw7-3Kc%JqDRU?C*9av#;mF1 z$+IwtWOsZai=|?M?BM9M(%v5E-^VZmfu~}HHx-)B?L=Nit;dEtW&?CNf!fOWwbeQA z^t!|BPMQRFL4q_;f?9|XDIPb0k7ReQxnTK<m`!tA4GIQh|x1%uYd8u}f>NM!t1kJ%Ca2Ffi>PUkMi1L$s1scl`lFpDVU_n8+b zrrco7=h*5AGcoODyP6BK8`jT(@$dV8G0=G9`~PU+%|NuE*w(}a=HAdaFWt}x(pp^6 z7k&{r zfYiC&Lh0Bkk&~?nEqcGIqP;i%T_g#5pZIDLJOVRVus$}r1*?7D1*Snc_{OV$F5(g> zMmefSBW}@dVo zn{_5q^jOIZ4YeF^jJ!h|wYHUi=G|mMI}1-9 z_gdR;_V?9B)I_ZeNLlPtJ45M8bUx@@-CWkuf751^ZgAPPwudG)=H!dI{_0-~vTt6EGp(TJ+*UIChzIt>J!Do4ND{}4?fq(5Sm(imz>UJzn;8|Ca z5c0djvJRa&$U6+Rs!1z7nsm{d3VU90*~Vz%A~kR4eRTNpGV`@8zp}$1>4ZjDEX5P$ zW-6YD%TK!cI;vEEMip6GDdkbLwK1_h>I#Cg~@ZCbDxN!zNJp z8zNnQ^R`tns9e^XM-*8oMRhnQ*<|4$0pqy9{$#BjhC+-OLSmCiC*E>O_=byMT<4pr ziRAe><#Ie3jF-M2ici8zmvF*U)9V%^(nQLH4r;s<2GSjW4lSsO3?P~R!7Xss!7T`^ zRs>|V^bH2|i7Jvh2h+cDdt`KyjyyRH65~oLO61dnwp_|>3za2SC1i0X*+{|8$Lpr0 zrNvm$w5eip(iA6pO+pY`luLm&KxWwylWRIS69f2=G`%_VWWa{?gBX?s>aQ;Yv=vxd zQ>3IN5&{N)1~`;EKerrLDD=s%yanFqcfu~JPO@DPRg8?@l(fB+2@~KbK-n>u7Ym5| z&Goz`UQf2s2O4mOc(%z-o{?h>;gSh<_RT`}`2AoG`A{7|x>g~yuOm0AsXLWkU3%P3*k!3N1;cG*RTlN5%q$JK$Tg9Dpz?1MGHK;z}__!+B{n8TIiO62SX3`o)atk(Ok&hm8-iU`Ed{rifTdwFfv7wt-a^clRkn zB!-BtjSZh<^<>y;s_}u=rtFhV^>5?C7&a__qLva|jf#XtUxL!qC&lseh&`GJ2W|qf z1xx8v6pKn+1dp8%@HKgro8deKV;x7={rM+6pL~py^EUhKt;Bj|2VKBGDKwcbut_kT zQ>6Uqg=~C8KH>a3p(jA5+bG2%k_hMuv?k7F%}qbkZu6pkecisyk}HHn>VO5GfA^Pv z8yR$+dCrkm>im0tQYTC?xHhLU!{y*pBz%B?YVb&Fa z2@EDgLINtDSe=$e(Lbo8vf%*@F_|E}&Cyg+u0z&uMkPbJqI-`#3*>*urKBrNN*@tb zz4s#bPCQ*6>keC;{M)>mc{e5F<1?0j&cE+2L<@ay63|HsDZ=0oZ^EE~T#31;Kn#5z z{d+d(bYcBmUDdB!*>!Zc2%-(7?$&ZRTuN{gOFvk+$bmt^{bfcu{Iz{P+_aRXNSkEE zse^4igVJCSuG8H$pgrF*t4Xf!qhO_zY|YJ_emqGxK8H6)PgoRGWK1LYA_A$CIOdv9`X zs0gq@5-l35Bw=j?lXCL4yCUg-Ic@GOVBmC^kQuGeM@UR|qD5R;OQMD&6jNBlxf%E;Fcmn>pii8v5RNuQIt)@Ygzr-Hr;~P@9owXctt3nN(|}|E{#f)Erbm*sO0IJy)dd58zJ6yVXEBwv zeFkuwXa)vE6U!L-LQI>H6UrW|`JiMa2o2=~+Hthk53D#uw-r(pBhFLgdB|_;ggj}% z@l6f^IBqAxHr}W*?E}UJgU<;v=euNb_(b(&sz%1MGXgPnCV3|AnCme zPdkjsh_;t7Q;w?Ky0H&`O%yBty++&UO{Ret&yrN3Bs~GB4nZHf`T$sG*<;|%oBdn# z+rv)g-ef>yuXS(uKFFx_MYv?vTBL!(;AzLH8&@iw$grAXjwW zV#>!7oFVNCZ4~C-)QoT`2I7ItbRMWf4@Av9lvOv@3T^2L$LG#(1|x>$lH3pR9fPVILhYq7ZvV1V?(_jF$m_`7;&-(KHeMis7J)y*oe< zDp*Os-|f4No3k^LR{zq*FuDMo=&>N(fI6B+fDcbkZ`&80=4IRMT%UC*|LG|j9g{qy zK4^A2`Y_~XPb(*oTmcf*z6Q`xBIr;FX0!J26WmgnN+%IROXm05vd(293$jjHYj-)2q5a z1YST24d&9ftj5G@$peEz{{|hb)glixFEdjDlGN8o8fylr}x`l(n2LSvAD+8 zWS_#NMD_+Lq)R-y!|OUyt4dz+km&a0=x}6z+s19q0I)bJ6_Xj1arbk3J0#IC(v0G^ zztqvg)B3EZ4VpS^VCm9 zooJ6;{2JWt2oaQ~-uwQe(#MffdnqW&<9;*6`MAMGa*j+Pl&FhvOLTZ`$jZ3V$Vpj| zsgAkPUNEUCN`<}*vo^{b9Rqan^6D~wiWX$BF2a`3JGG+Mrk)vAa#cdjKhE<_dbUe~ z_TEUU(deS^aHB|Q5o?DIdGa8@M1y)4O6gSEf7g-`;u_Bu9V_4O7gGKKA&>-JZkyJN zB={CsfvCd%E+R)P=6wt$g?{ib zq7>N!GlgS88u3e<(_%_U+yv70{pz;y;=DegkXS@Kl9y$Rzw9W)H7g`)thGv>VVvNv zMedlCS362o*zPrAVzO3ht`cp3n1JOMLj|>?%W(_RUvMs7UQ_5yK^K}Vs)a4$Ty63e z@h&v>G30t6UTT6y~%LId~I>% zeSvW^yd^fSJ{GKVqJx_E{sSB_e)2i&xBqd|>9<>~yvGDnH>6Ns`879xNwi_qd^xbO zR`SmEiu%OswKvaJc!6U_$`$an%VF2Zw)As&D;(mH-P*mUTzx_Ql|v?b6z<54U^aFMavn=6fIWvdH<0 z3npi`3nrcNM36rE7oKF2QTvEVDWs%Q#~4cQi63IgISSs7HLI%AT zk6D$OZBpPlMz^MaQ2|4MDv~1wRR$qYkZC$pN{tkS#HI=xd)0{rZyi&JC+gH&-w0*= z7Cm7L$80#7G9MT*osym`-34Atxv^MdBD)ey)NGzw+BYroE z(U%Mm9nSy)zN19cK7@lsIMF9j4Mk0QkC*2t6wRgx-q0K0ljfnkuC2#N;1GQy=dqqO z(llpN&SH#;k2#v5tePvRgIIW0N1{y2D#KnBb%9Bb9j8d^Mi!iyT4d8%u#l>$Qb%+y z9RE>a6>@`r{Ld;Iy0j66zP_%RG)!B5Lma4el^_Ay4OIjg`I)4e+3zV0tCT;r?<@$F z38uG0_>5O%Kr-OMp0UUD2^9wV;Ve%aoa(5gE9n>((!gInM7HtyM1FS6byt$#%jS1m zey^C{9r?Ywr+==B7_LC6YU@|eQl+4Ye7VxW9V_&I50hw7Gj=!$DrM}m_`mkuP z%uce$-qI(-q3`roDhyr_tpo;>L3h`Y2-FUzeynNVqC@l55`!WWBa^TfBvwR!i#Utz zY{R|mfMCys<(QFH7HL;P{me+k9pCpKlm`2n$Dd%qN?XeDPu`7$H)h_rMoMjb<-wOD z+4>%T`o8YvDwWp*C3fwvptH&Z6*;d3JJSp~MJb(X4AM*9o>UACG@#tgI+)}%sM$-d zMA=auI_lUL{y(H+1RPT&>C&($y!Lub@G|OC5m+*`NLK0kKzR$5cATg{k4IYQKce6k zGsdiJ9eYzBSjeeQ&bbTnJY`>#T6CFA6Np8Br>iCDnx=7HGI%qVaZ|GJDi>UT2BfKf zFC9h|HY5w9RLE~)T=7+^InNQr#hptqwJ?Y*z`d2`0Vr1mDBcGc_FjG`A zg1V8*Lg%lXU!iOjC!}cURHiH?6d#;4{UZ@ug~-xq zJYFqRUHgHL@pltnh$>Xza2mRlazM&|pEGWVm@<_nL8%>qW+*`B1e6Sv_$ZiRoUzff zxIa-9E?EjiG>Zs5B)r4LXdx$z*Mvg1s1A?(qQ#OXSw6v-n_9Xs#*yX}WRWDJR|s-Q zMmiGlIrXv%e$yOcL18^f&46Wgz7Ema>OPhW`6DbVsZ4HO4WyHCyURS#&PoS=AG3=Q z7yA9|Hh0Bgb*3qV86Hg+ zFobq7D)P*uyF1)N>P9**3Rp^i)Nxkjcn~8YZ46b0EpxcC_+Bz*9G6TTB1OgALc1;& zb18?ba;Rm1=2QIu_eOhihf6`sP3`?{Us{b2BxI}y%X%De=%^(XlEzw@$-~SpCFOKq zY{9SVJ;syze%lzx4gO9KGxdE@ky9Ak2c5H_{NW7F3PARI8}U=hyKmlq8*)FV+d~~t zYxqg*7L`GjB}9ud;fW6jbmF1OtAI*Clgdltb-*NV#vzr6rcFm8^)ni0&kpNdr#>uL z%}e-$geDCvT0!9Em4lWd7W<@@{p6Gsr3$AZ5LH)j&}#CN4)>A)_QzUMH1Kyw(9n9vZZ0+5gsPW_Oho&dUmgXaJTPn?r8e<=)U8`|xo zq(5{XYmRPpMbzu}9n>paL^H*{s^E0u%7RFX62b(u>t9JFR2-s8ny(EHkQB!icZAok zmHf}u{LhE^pO5lCALoBQ$^Bd|<$tzy%X>eS=L~}1{j7%li$M;5)->&b+P*>QJ_l8O zkLu7AD@rJgBxuUVnQ0&eTIG1F6m4L&m`QV)d}~Bnw}CfS@3=R~$x)ma|J8u~L|1SY z*Fgk5iWYo8)@QhSGqHFiwI^blX+e0Hf@J|#7*Qnz5DH(Ux_SY_#fvywa6BDUO039& zXZ|D&cC@4dPzkAj#mJg8RzbKJ(3&s4KHLvo2LZCU@{;?ejEY`QI_So~_P(BQD2LRz zA3jS1Zj#GMJae%0*$E&pWcQ@t^W=}wMZn*+5DU664#TE=VH-apb}*tW`Q=2i0Bs^g z+Cg9zJ{!I^JZBAV@*>XOJ$G?=HVuf^WW|f zhqu-Jc)g$6;i<54wkC2$Rfmko`H#An`?e@wYi(qFTYgjRx^fBXp$IKo>3`%ePEio;BsLub2~(}2Iu1B$o83M@I(i>uBlt7F{&(|f9&k=c+A?DKT`=;P{Y!H57NO0yO~R(h@|)|g~MAfgFed){()V}!DgEq zMec7?t8@YI>SmAAW^?SeNZ^@zTNGyGP@4g748?p7=M!JuUHaq`c z4b0Hgi&A#A1blgQj!OXj$D>H6TKcOsLFMByDIW`ot++$v0N*M!EVR*?S~r7+2_P^r zbi=1d>TF10X?w?MlT-3>RBT-Tz1q>(> zOw2^lcF}}r6olULnH>$X8(@Xk01#l0u2IX??SFC`{d$L@Eo`oU9R$D0%=54Hn@=wK zmmk(IT_726+gWzpTRo8$Yn-cMk&IV2i}*g6CK`gx&xe+YnVeFd@@xBl`n+@9cCWjg zLEE6+Na#Q=%W6NdWj*UiGX59V_Gut16%brpD~SChE%bnA)VwL>vW+G^xdU8Z#gR&) zGB>OcdVJ!i+_Uh2+*%xFrAHg$5Y^suU?3s4hrH49mG!6cG{d(PZL6EbnFv0i5b%2# zaQ3T@)F#GlX9Tx^OcrT>U0S16Fq??4k}k|j;&Mz34wY-7b$NTs_a?tYpg{{8!t*O@p0n2x24C)(Lp@Ad2@B z!21D!uoh!d3({Z^n1pXJQgvcrLJNG$s7_ybU4asGRQMWOlch)aMY}2|mIr!*Qn#Yu zH1i~B&bs_}i~CG}QpyIlk1ti|$`z3uw^>Nll+jg7{5fQ8T4Wc*{T`-CyNZKK>Ffji zX|h%m-u0{!{YvF?sL||OT!J$BF3&YrT-Ue^^f)bW<7xp5fT7!hJE|J)P-x8?H=fZ{2}eMhdO^R)ncIRr@~sE( zDp)jPWa-99zx&IGZwj#=6V3k@>7a2)hW&+d@wWxW!n%_xpbT`{gktEeo>Yi}T86$7 zS1*FT+E7)0->6E4G05b;>FWjUV>m`llDYj{L(co|>-=U}% zddFVnNTG|g+X_nKC0%{A%;vPr2m?s+o9{2#g(B*m3Wf`v(0b3XY^HFmSmavZnLThw zhopsU)C_>XTsk-`34oEV-?F0UMQts0b0bHltpH4aZ*ksBFJ_|C6CW@&4it?DuMEW8 z6p9*q`If!Hye*;$D!LiQjG}OA%cWUzG8c%RdY2QijiAT}ET+q$u;7<~T&u&jSw`a> zkcSH7`tXpb=oA#VTkZfoWGU=}+uI>;3OUz|!_cvTh+qMDivZqy+jiubmue)u@Ce=JzDTwO+VXL_@Ink z&04k?yRxr?oJPqdmRZXfy&SJ5eKc<;rEWc4>%xQYN@a1?18Gkyyu-oKu&+4_)ADbB zh1CLB*K0>m%{m_Zu6W_qDc@*%ezxE|jIDP_zke^zt~44bWVmg!&R+3zC}SyLhGk3& zqd%Z-Ix1>Z|4XKI1hZyD?QS^v)->>Ov^&W_%?bAw_ye|A(1 zTn=Aln(2I+RkC-{V4N(oOwSn-^(Rl*x_g_*7WsgOkQLpt`Jy18`#V-0-!mY zBcM5bGoxf4-fVF&y%wC)Gz(h`*rkjLGwVFK3%_NZr&b?-GG-A*XTr)VjqfdgTt#l) z^kjT?$ssB6eg}=tHq{~%`*Y5vD`ejHTlbk?E zp-CT(oUN|asxIaL zn?-l*?^0miLC9+9Q+f%`lTj+EOoLsoTGcsNMlyveYn&Cof)Ij-AKbN+EK#+Kg8fyeaCf zJ5&MEyhkqcDVn$8s)XVp4Kzn3>)SC68oV(cv=$vxZdi&MnF1516 z3anl!qv`Nf#mG-6NbuBux(gosPzZ5?<(dtNCg_tkm#`|?>}yS&wn0)a6@3H`fyM`S zXbat6%;E2lR9p2um*@Sepy{lbHF!^7UjunT{U#W=hS$IVzkBPx*0-)W&Cxoohg78h zm5%5%{Vc~hEWHr6kx}P$z2EPCbQ`F~{ISz&^HZ~XecSE>-n$lmw=V3Oa~ORDilF=S zeCLORtVP&8l01BDbgep?n?40|7I>%X)th%JJ(Ry08Wc!u(YHIO$QI=Tph}dPi5&`$ zv@@kBO;U0~OXgRnB%KDK%b?&tSKbRgg3`OIVdrX1oo|*f_Rrp<@y(r%?RLK~vv+Nj zWby3gcj@P|?=)b4>4>RYGeLbNGarNMWmPcqxoSg%IZnwE-jr_i${^{fRKA=i4*sU51QjUOFq-gGMEl6!HM}fW}@>D3(`?=vt06S=XbWD9)p7%CnVHuX19?o@ON! zl@yBd;S0y6lt51JT$)2Saqa2XMnpMqN>b3Pp573DE;sA{wR3*m8R7w$7cZA@t@--L zmGoQ zbfArPfK3wu=UNZuzBC zX-gH(*H)2kw(2fKD_b@aNnO1wLNblK-a2! zxjyF)htTYu%6|laMumSYe3d^MzRGLi%hJSWGye(cF(I}_Iu$lP5<#)Jk&VrN zD_OwwtNDkAz<*4lMKCTd?iYWb{;m2S$=~d_TlT%7i}}^11IhX0RC|s>#t3Rps)kBsRq2vV#B3&O z7pz_e{T@dV@We>@1MI2m^UT2Tc%+Jfo4bSdJsW$&{_c0^O~OG~gafI6`V`N92;H5L z_gJVFW|HNoQu>MBv%VF4Qpw$@%=k*^adcynoU@-&q_TuBwBn0?>kEb&Y6i^aED=oY zn0#Ag+Sj8B;Ot@;A7zD5+$4fJkiH=8b>&Z>xk$(aTS&O$cu&E;?cI4;P2KxH@Y6h> zlxU(+h31k74WuYTNkT$~R7#>k(I!`X7*U=Q+mx3s*9WDCpF|dQxuBcC0*So zerA_`QKeRNp=$S;-Qw=4gMW>Ede!7RF)3?i{~}Izh53?CYsb5{H^`J^kR%5-ZTl9- z*SBziv#8e?B`t`{K67$x`CvnKW=x^V%L&1zCrmAuza;ogP`_eX(j5GB4rlE({*oQ~ z*!S~&Jw1`TE|2dxxK7CCyqev^fGr+kE|R`mZi}%6~M-*h){lgYyn2fV6b=`JxP=DM??c-^OM+J<>6TZA<>=eJh=hz9MGv@J+ z+6NoLua#{Xth#2ur_UqztmEhbuHkykoR+QflFDoH4m(C#f2FJ~jsJA+*~ZeWH*4xs z8-nsW?`pGiH0|$J9MVYDeHk>T^h>H-LphkWA%OBtoVd&Lcw|I29A9Z{uSdK zA3qE<=Bbs&StK6ITV28B{Y_#+J$)=?`BbdY5*7RE?Y$+|-+aodYnP;oXc}ejUiUyu zv3jhF>%Airk7S$I0g7(LP^@l<-R5hq#qyty<%V*ksU*2IUtdaZLNB;+T?*$zrnsqe zX^prIw+naK@m)SwSLPOR$>RC=))n`T#x&9M7_O7*c_S=fS>iRyCT^zq?tbzf3#_*U4Q5D!T8;Yk1DYY4trW&lsty`eCv- z=<_n)o4U2;u9Nq_svb$*8hG=jNSDRxTy16B7uT=E8U=M}Tk!3=VBwL{a^8ae@{Wv) z^LI>oZ+3L}@@{ans50u9{h9l^lV97O?5x*%e!7xzO{UrzO_DOqiVEh z&kio?+g*$~bWgjaA{6fS98NfOGxCFrqVL#9*3riSQNH&4{LBV+yCWK^s`h+{-kteO zCyL?Cvy(Sl0$(t6P79W=oDwj8V5H&3awhM`2;Etx$Ew;Ns-igN80xa@U911x{)cvV z^mA*vSM8!JIh5v5Kemx;MVCMDn2x@I^49Lody7kAnv8cUpM5?(RDL1qf_|$Lw@dHl zN9V-tVg$AY33A1q9~2Z-H;Fe5&~Cijx#u%;^KxE?@o~8(-VX6VpB)d|7acqCaoZ<# zDjMS1F-I`u@|M!NBR<2KU&9L5AE|jM9$|Os)BJ>8(zjpbMSk&Wak;@i*4H=QA$Co1 z8%5#np2DXGNQ#fV4TW+O%6F)rc2Ube%Y6K{Y-OeEJdWmx1J$W9ewCd|&yUr3;pe!aX&E*Gv}~4|AFNNAimZS|=?!GupfK_=>zV$?ebXXOEL zd4>(w6l_~|)V*L%tw4O*or^CHZsZpU9T>1>NY{;RSjb5kyRTD|B6_R&gy(J>{wrgz zdo~K4Ob_+$Pd9fEj6UpfATpBdcCOsZKE$Qqo%H&7+CB=Y(We8vQ;II;?wqqkQoQGZ z`IzCUTIV#W$al*WZK9LhddjYwswth2b!U0lC;$CxeuI4=t9YTJE?=SUPM6rP^cE^* z?wrB&%UV@q#R@5geA7G+M-Hi5|6uI3-kRs}V$4dzMB{RI!HSbwx9s?;ozLI#yVP`f zW6Yd|;rDOLgrqntk7{VA^^3B08=A=o#mSNeG8Gzf%vyG4ds_Y&9#C&;wR`&Qd3(yk z_+}<;>L=CN^B1OcsC6HEPxrW-Gd%P12hI}v3E`5({Opf{Ck!ZyIqQl_OE(5xnx}oQ z+tfpCq_KTHF?QtU+_6ogCk_NIJH?gLGsgB(NOW7Fc!?vwMd3^NANq~fw$4xY)7^40 zb=g{zaq9Ly?!y`-H)K83!XAJ1>3q2{HS@`d?^o77KHAivU#PKS$GxcyuitNRHj!(H zAieQ_`TAPdjgY6T6q{EPl;;bHlgF-`b^kDXo#g&7YwtiFIoYDK_;utqvoY1%Zja@| z1@2ULe&Bo2#M+VkKttoOWYOH*M_!Fd5vuF2=)U;c)-~sIj`48WbeNWJz>!w@@wyX! zaR(>bzZPe4%a>VAm8ajg**2|IGN*sLoRs6UCA)b>FJ%Z{$+eTa+Fa_lff8;p??Jz@ z_T2S31|wer32PleMitTylla}LXVglG`N`HYbUSzF>7^V=d^6{?!*bK3qW5@Sj&DvZ z9{psgQ@S^zDO0ihn9q;fockn8s}if-By1Nz!Ld&A3pQ^HH~7)_|q zOpSHTms(wIy4NZ6U-Q0Z)Hbgp<_ljf+NjjjP_6&^-q=YKnSFcG_f)-i8eR1&j89*C zI^u!j-kVL*dgtmA%EE-Y?u`qaDE%7MXqmtGugB&GH;Xr4`mvFlE5L9?YG#=LrBc~m zRC3&gloYX|hbcPThY%9bOLvWl5pz$vFt_bNsl-K2!}I5~3Y-|oV)}_m>*t>2G`GmR zlXdxB(hVKwL}qT^tk%^#O174K%Ir^FbwEhg++KT8$Z19sV(kg zcWp{Y3VfjBxL1Jh$a@`cX&dD{qozE{q*us3fh)tJtHe4e-{|hdXG58#cHZ5I?mDC+akWaefQ^W~rXYna&3(4H2EsOeb8e4<(0RpNJS4Szg9*sPDaEz)fFiyCPih>Zd;_5xu)b9*1zOKBBBrucWi|^O-4T>5)gC zK5c5l^A8McJ=Zb$*4(yl%PY11sK*1I&GlPDPle{~>9kr)c|7s;h=+KOX<8na`1kWd z8y9886w+<)Ze~f~Hhir;lA+dHtMomtxmqIg+io_u8cj-(`=tZasE@rNKw* z+x>B7N@31n&s*#6ZaJp1+v18@$z-wWrq!=D^9gtUNa?Q+uitTXaAMkTNuKpq+ic!_ zUgy=tFZ*w?dnH>caN3w{PIN#)lDzM6&ncHLdz^;+Z<<^)Fpf;=O6+;HX{&l-UXo1V zLsgYX|8wSYRp;MC%YXf=X0z?Vn!zVB$CkA!Sv&PsvQVVjY+r832)Djae?-*v0JGf>_ut$ucYuA-Lf^R1dE%+5NVp3PgIq~Sr>mq*NJey-*tS!0>^ zrtU$SC*4zPr%~k`YrnWA#Mkn zhhA(>a4n18_AYzhdglIBgBvtAcxG-|9p+I>7#Fk6qqIq!$UC`F+n7GE#X>Q_jBXkI zt5)h4kVCm8E^do*VOLS|&%D4bQ!dL{ab38GPoiI{VW7-3xzRc>{ZQ}o{NUSW&sUl= zL@A$?yd+~DsjtTC+-)Bk)ZCT8viaM*sKUfsKVIdywD0TE8hMbWrW4n&%_&0utzK2n zah=6QPxHO7LvCw)~<{Pl&AKCMSdL{nIjEj{C%a(skDHUAOy) z)h>BH<%;xM6(+i->7-ScPF<2%?8a4&vzEA=Wt-L3 zRh~6@>eBSEgmG`y=`@p+#-3%)N1R^C%0_Q;tK&E<{P|9iRfkw#=EEHk`>t11Fg^?C zTQ-rc^uwfA?f#RUPweKaj*!x_M{oPr+*_p@zI|2Z#(CcE0}OdiJQpRq<_D~3R8u`= zmoJ|cwQ*w3b&C8$9pM*cz3IJ$)gKbQIQgD$Vex!^o)K;G+0G&-L(G7 zmLQ_v8ZYF@K6vnnR#kUK@?DP6>Ukal9cfz_UD-Lp*7BGqaU^%83b+)E7SD@S2#ZW@ zyS-f6hUK-d9TXj2?$eU57;Myq^f3R5lON z&&yfH=1|C3zh~=m(HoVO=L9dW*6fVteXUecuRIGjwO2ioS3JkWDqfCHhnWa>?|)_aHRHH{ zJmuS#)kfA2f{JTc^BdcPl^$76rLYJbPTU^mVDCTJVbZa#jC<@GMRj8M9;IHdGVosX zxdNRi#se3=os!gacBti7U27d@m}>Lg%Ig4=`xbSXTj@ILE(?m)1}iGl?>$tOwla9aH`2brf^H z^HybV()4C#KeUTP&o%D_MP-ChXi3GOsC3L#X?2d|V%EdYQtcEf8pvEx-*-qoOI{&Y zV$Jg;`wPFM8*8WM#ggITIeza;HqU+FclNwnYa_R|!nQm7L+x>wgoK%{Z^iYY>+->Ew{3VCx6nT z=SuU9!_MzrvH8dlWANkmdhvfL=#1Psr>*tS>dDq9&6;k@C#@#?&W{MZ`Sd(mT&^o$ z?5U@+L@w(oBc*4-t4LgOHD0Cyg@qr6)1Im^j8I;CVKw+=oxkZyYS{vwFiqalksUTgiXW%m2dDWlS zCG+|d=4`2AxA75e73);L-BHo>zGs3({<`P>_^2H-mo(k2E}sns6&%`1{8}d&G%v{O z>EHj(aOL`S*V9Lrq-?y+{$jq0d9bB++V%jEO|bzR-zN@uE!yLCHPCazg3BZwUrNA1 z{(+(UcXxf;dCgKUq{(v3=@5g<#ya)P%|82mLKw`&YZr7>WFAgV=2emD?tGo;aMnl8 zH*b?+D}5B7m&!fayQW+(YMAJqcbUlSNOq05F&?zJaC|ve2D9*nFq?d}TBE`XO{qcW z1A0r+Q^)v1$DX=-lfCP&tUedM?k$U|0fjyHnsM-F&7J9#@@&T(%3@uiy`u&5L{&7{ zKlT~Kobq?i%ArKI$H~~5Y zuJ2#&f2AxhHoRf)vM*OtO_NjPn^^1~?(YTOuasq+zf`F z?n>CW#@;zZB=&3B5Zj>1@e-1*r`y#@vGDti36w{Tr;;xox{1|nD9pkmT+5R& z$ex)>3M;lbwKZg@xMY8COZfgpy9JZ@mPrfF^?4U>%p(%-TiDG{B>J!HV-Q&^?)+TE znRDB`%Qq)%+y(UvikolTUMjG7^Y*tgQ|GT*HQA>RFmyhCdCJZtZe?}Q%R{@p?58g{ zeCCN4CI#40&(N8zhc{{LkDVx5>;56?*b;+xLBkJS>aAwoFTHK_SETZWsg z920lXn&kMjIUnO|k3{PZSn1bq_OmRKTWoW?Mq)aQSlsZVUdK4FD^OZFE&lL=8zsDP zW(GuWI$Hqmnu2q2>KY-ordywBemH$=#F*vIbU~f5wL<%Z#oQr^ks$*kABn`uO6p4| zY~2}`v)5CR*V&ex=*}3yNKXxH^!_!FAINl=VJ0wmo>7r@#HVXaYy?*ytsqNiEnre& zZ=lXP+d#*Hjs+bHIu>*+=vdIPpkqPDf{q0p3py5bEa+I!v7lo?$AXRp9Sb@ZbS&st z(6OLnLC1oQ1sw}I7IZA=SkSScV?oD)js+bHIu>*+=vdIPpkqPDf{q0p3py5bEa+I! zv7lo?$AXRp9Sb@ZbS&st(6OLnLC1oQ1sw}I7IZA=SkSScV?oD)js+bHIu>*+=vdIP zpkqPDf{q0p3py5bEa+I!v7lo?$AXRp9Sb@ZbnO3yj@67}<|nQMGD*`)uYWVKGFO=l zXam}@%x!cte(b&wrgb!dc*i*ApZ&?#n3mJ@XV1E_{lB=fjPlG%)c?=AZQpEzD+^Z^ zt}I+xxUz6%;mX35g)0kJ7OpH@S-7%rW#P)gm4zz{R~D`;Tv@oXaAo1j!j*+93s)Ad zEL>T*vT$YL%EFa}D+^Z^t}I+xxUz6%;mX35g)0kJ7OpH@S-7%rW#P)gm4zz{R~D`; zTv@oXaAo1j!j*+93s)AdEL>T*vT$YL%EFa}D+^Z^t}I+xxUz6%;mX35g)0kJ7OpH@ zS-7%rW#P)gm4zz{R~D`;Tv@oX|Js%9Pba9Z>>66+b(WN+2KsL?8_))3Nm*)uO3LyR ztKyjDXri;OEHy}VW%&ueJItaq!C72(?hq|58$?HvCGikxg=AquM4ov*dneVIoo#St z;mpFBg)<9h7S1f3Sva$BX5q}jnT0b8XBN&ZoLM-taAx7m!kL9L3uhM2ESy<5vv6kN z%)*(4GYe-H&Mcf+IJ0nO;mpFBg)<9h7S1f3Sva$BX5q}jnT0b8XBN&ZoLM-taAx7m z!kL9L3uhM2ESy<5vv6kN%)*(4GYe-H&Mcf+IJ0nO;mpFBg)<9h7S1f3Sva$BX5q}j znT0b8XBN&ZoLM-taAx7m!kL9L3upFUJF`RS1bZrrE-msp>&#LEc^NEQIsU7^wgoFL zR40rwS?e^!{~8U9U}l?%=j7MbN`yQ#eFYy&R~ zUKYG8cvmWmjy2iUKYG8cvmWmjy2iUKYG8cv>ud~i9HKV?e z)tDwgC{(hYrl@(6XRqLCb=c1uY9&7PKsAS3tASm zENEHKvY=%_%Yv2#Eel!}v@B>@(6XRqLCb=c1uY9&7PKsAS3tASmENEHKvY=%_%Yv2#Eel!}v@B>@(6XRqLCb=c1uY9&7PKsA zSF%Z~h{W!KXpud|{oH9!?*MS@$zxI-)17SSZk%Cgir zRhAVA9u(&xjJ)ZEX%l`Dv(yACG5d3Z;7{Q^H1Sz#mS>cfnhl~OEe?JvAw-DCGtX!5 zr;@X?4dg7yS&*|JXF<+_oCP@xau(z)$XSrHAZJ0&f}9083vw3ZEXY}qvmj?d&Vrl; zISXGQc5B$TzV|(@L+i?kqLh zFi4Fyx3DYHMiqxR9O>w((ZAZ**UUq3Wr52Amjx~hTo$-2a9QB8z-58U0+$6Y3tSesEO1%i zvcP45%L11LE(=^1xGZp4;IhDFfy)Ay1uhF*7Pu^MS>Uq3Wr52Amjx~hTo$-2a9QB8 zz-58U0+$6Y3tSesEO1%ivcP45%L11LE(=^1xGZp4;IhDFfy)Ay1uhF*7Pu^MS>Uq3 zWr52Amjx~hTo$-2a9QB8z-58U0+$6Y3taa9h|B8GBCoWrtO0F+mXsAHo(yv=ris$J zvciO01(_WDDV&EUVHTJb8cPo~Zj5VP*5^nfwFS|Uq)0rZqc+D5JJ}GHYz&LoKU1~Y z*#>PE+AOqLXtU5}q0K^@g*FRq7TPSdS!lD+W}(eOn}s$DZ5G-rv{`7g&}N~{LYsv) z3vCwKEVNl@v(RRt%|e@nHVbVQ+AOqLXtU5}q0K^@g*FRq7TPSdS!lD+W}(eOn}s$D zZ5G-rv{`7g&}N~{LYsv)3vCwKEVNl@v(RRt%|e@nHVbVQ+AOqLXtU5}q0K^@g*FRq z7TPSdS!lD+W}(eOn}s$DZ5G-rv{`7g&}RR&HanJ1teN7}q(xq5wb`-sYyDiNwEc#3 zTo>u-sRL>lxDE;ZSA}ic$3QYNWMJeYkyu$t)VK*FmpbjhPuG~(h`HmxF|%?c9zuDH ztjNVhVi}?mv$GAvEQnbUvmjDUR6PO|Wyru81zCJj%bXIrLjavcK$3#2OYNt&lAI_x5!DR@+cI5#2*xK;M=^ z1oe{V2IupW2`_j0IV#lh{+SzUY<-iRw~~5Q$+442D}GsuAjEsg+KPV~v~HaFxjc2y zR%%oJWl#lirI);t_n(7^hF2kkJowA8FxIlQp-<5a& zR{3x`adUvW#@JKVV2%X~{@&C-q6BhpIA3kcDdWTu}R zIdh%X=Epc%BXA1T#_@D{2{S*CegQrJ-A6yfH*eAz)om8 zG4TB_$%ez!vbPZ4gXCqrf0!$o8fMu3adxhm8;J5hlYYG!{#sY8D+e*;${{@b?Axhs2*X5rZ6rV+A$w=WXPFiuyzLOi>JbhdF|SWF?5FZR}kC%kn>~ zJ2dj2S!aHwR{TEO*l*h=^~<(p_;Hes+8jIVWJ6f8F^Kb1tDKS5X`fXy6AuHyVH|M@!TYm<}b^{5X~cGJ>@?Qnt7g4$Nc=+{L3Ie1}>tN ziE%Ztwvx=x`_Hk&<5B9?vl6wV^-46N+Qh>t*HvPg^SW!T$3G63#^? z(pVVh5_8C8k(pEfhs63Z>J}OC{7e)f6h4yY6Y}F^DaC)Lh8oWl_dhir_@zc`!h4)- p`=d2^YVPbT*Alb0_1`xuz0F9S%VYU-by4J6W*WHR+%{||R4hsFQ^ delta 223450 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 MCy}njQE31AA4(bR-v9sr diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 195a787334..20f7c8d61f 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.2985310813" + signature = "rusEFI 2020.12.22.all.599246323" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.all.2985310813" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.all.599246323" ; 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 15:06:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:20 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 cfadabba38..bbb32e8427 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.662735782" + signature = "rusEFI 2020.12.22.frankenso_na6.3049747464" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.frankenso_na6.662735782" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.frankenso_na6.3049747464" ; 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 15:06:59 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:26 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 9f51205e0c..11f7f26d79 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.2013371550" + signature = "rusEFI 2020.12.22.hellen_cypress.3930481456" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.hellen_cypress.2013371550" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.hellen_cypress.3930481456" ; 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 15:07:08 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 22:23:44 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 b32fdb6e7a..caf806162e 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.689808996" + signature = "rusEFI 2020.12.22.kin.3143260618" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.kin.689808996" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.kin.3143260618" ; 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 15:07:07 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 22:23:42 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 a66ebfea2e..ea8db1317e 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.2787173412" + signature = "rusEFI 2020.12.22.mre_f4.879172490" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.mre_f4.2787173412" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.mre_f4.879172490" ; 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 15:06:57 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:24 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 87c6828b0c..2f935763a0 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.2787173412" + signature = "rusEFI 2020.12.22.mre_f7.879172490" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.mre_f7.2787173412" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.mre_f7.879172490" ; 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 15:06:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:22 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 7317cc30fc..e59f520295 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.4079500300" + signature = "rusEFI 2020.12.22.prometheus_405.1634714530" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.prometheus_405.4079500300" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.prometheus_405.1634714530" ; 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 15:07:02 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:37 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 24b8384a19..7f102b38d6 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.4079500300" + signature = "rusEFI 2020.12.22.prometheus_469.1634714530" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.prometheus_469.4079500300" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.prometheus_469.1634714530" ; 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 15:07:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:35 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 703cb51007..2b8f0869e6 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.2019192963" + signature = "rusEFI 2020.12.22.proteus_f4.3927805741" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.proteus_f4.2019192963" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.proteus_f4.3927805741" ; 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 15:07:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:40 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 72393f4bf1..876d1aed3f 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.2019192963" + signature = "rusEFI 2020.12.22.proteus_f7.3927805741" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.12.22.proteus_f7.2019192963" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.12.22.proteus_f7.3927805741" ; 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 15:07:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:39 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", "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" + engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "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", "PROTEUS_QC_TEST_BOARD", "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_DEFAULTS", "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 fbbb721441..58203e602a 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 15:06:54 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 22 22:23:20 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -386,7 +386,6 @@ public class Fields { public static final int ET_DODGE_NEON_2003_CRANK = 46; public static final int ET_FORD_ASPIRE = 3; public static final int ET_FORD_ESCORT_GT = 14; - public static final int ET_FORD_FIESTA = 4; public static final int ET_FORD_INLINE_6 = 7; public static final int ET_FRANKENSO_MIATA_NA6 = 41; public static final int ET_FRANKENSO_MIATA_NA6_VAF = 57; @@ -1183,6 +1182,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 599246323; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1463,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.2985310813"; + public static final String TS_SIGNATURE = "rusEFI 2020.12.22.all.599246323"; 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 ac58aba82b..cb1a791639 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +