From 4a6bca0a2a29be0875187eeb450063e631d0c36a Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 3 Feb 2021 19:36:47 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/auto_generated_enums.cpp | 6 +++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 9 +++++---- .../controllers/algo/auto_generated_enums.cpp | 6 +++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 9 +++++---- .../controllers/algo/auto_generated_enums.cpp | 6 +++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 9 +++++---- .../controllers/generated/signature_all.h | 6 +++--- .../generated/signature_frankenso_na6.h | 6 +++--- .../generated/signature_hellen72.h | 6 +++--- .../generated/signature_hellen_cypress.h | 6 +++--- .../controllers/generated/signature_kin.h | 6 +++--- .../controllers/generated/signature_mre_f4.h | 6 +++--- .../controllers/generated/signature_mre_f7.h | 6 +++--- .../generated/signature_prometheus_405.h | 6 +++--- .../generated/signature_prometheus_469.h | 6 +++--- .../generated/signature_proteus_f4.h | 6 +++--- .../generated/signature_proteus_f7.h | 6 +++--- firmware/tunerstudio/generated/cache.zip | Bin 1068911 -> 1069087 bytes firmware/tunerstudio/generated/rusefi.ini | 8 ++++---- .../generated/rusefi_frankenso_na6.ini | 8 ++++---- .../tunerstudio/generated/rusefi_hellen72.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 | 2 +- java_console/rusefi.xml | 2 +- 38 files changed, 113 insertions(+), 110 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 8bf495b93f..dac1f3d979 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Tue Feb 02 14:16:48 UTC 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Wed Feb 03 19:36:02 UTC 2021 // see also gen_config_and_enums.bat @@ -939,10 +939,10 @@ case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; -case PROTEUS_DEFAULTS: - return "PROTEUS_DEFAULTS"; case PROTEUS_ANALOG_PWM_TEST: return "PROTEUS_ANALOG_PWM_TEST"; +case PROTEUS_DEFAULTS: + return "PROTEUS_DEFAULTS"; case PROTEUS_MIATA_NB2: return "PROTEUS_MIATA_NB2"; case PROTEUS_QC_TEST_BOARD: 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 fd1e726414..d028d74af2 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 Feb 02 14:17:12 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Feb 03 19:36:27 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3802,4 +3802,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 Feb 02 14:17:12 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Feb 03 19:36:27 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 0a6b9edcd0..f74182abda 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 @@ -404,7 +404,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST" #define engineChartSize_offset 1480 #define engineCode_offset 1128 #define engineConfiguration_offset 0 @@ -442,6 +442,7 @@ #define ET_MRE_NEW_TEST_BOARD 31 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_SUBARU_EJ18 37 +#define ET_PROTEUS_ANALOG_PWM_TEST 106 #define ET_PROTEUS_BMW_M73 63 #define ET_PROTEUS_MIATA_NB2 67 #define ET_PROTEUS_QC_TEST_BOARD 42 @@ -1256,8 +1257,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1973857673 +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 1956404947 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1591,7 +1592,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.02.hellen_cypress.1973857673" +#define TS_SIGNATURE "rusEFI 2021.02.03.hellen_cypress.1956404947" #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/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index 83a82a49ae..db5172bbb1 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Tue Feb 02 14:16:47 UTC 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Wed Feb 03 19:36:02 UTC 2021 // see also gen_config_and_enums.bat @@ -735,10 +735,10 @@ case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; -case PROTEUS_DEFAULTS: - return "PROTEUS_DEFAULTS"; case PROTEUS_ANALOG_PWM_TEST: return "PROTEUS_ANALOG_PWM_TEST"; +case PROTEUS_DEFAULTS: + return "PROTEUS_DEFAULTS"; case PROTEUS_MIATA_NB2: return "PROTEUS_MIATA_NB2"; case PROTEUS_QC_TEST_BOARD: 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 9f02cd4bba..28dceef8d6 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 Feb 02 14:17:10 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Feb 03 19:36:26 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3802,4 +3802,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 Feb 02 14:17:10 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Feb 03 19:36:26 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 5331f23b75..b22f322eee 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -404,7 +404,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST" #define engineChartSize_offset 1480 #define engineCode_offset 1128 #define engineConfiguration_offset 0 @@ -442,6 +442,7 @@ #define ET_MRE_NEW_TEST_BOARD 31 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_SUBARU_EJ18 37 +#define ET_PROTEUS_ANALOG_PWM_TEST 106 #define ET_PROTEUS_BMW_M73 63 #define ET_PROTEUS_MIATA_NB2 67 #define ET_PROTEUS_QC_TEST_BOARD 42 @@ -1256,8 +1257,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1973857673 +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 1956404947 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1591,7 +1592,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.02.kin.1973857673" +#define TS_SIGNATURE "rusEFI 2021.02.03.kin.1956404947" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index a8fc620dcf..9b6bb48ccf 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Tue Feb 02 14:16:47 UTC 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Wed Feb 03 19:36:01 UTC 2021 // see also gen_config_and_enums.bat @@ -913,10 +913,10 @@ case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; -case PROTEUS_DEFAULTS: - return "PROTEUS_DEFAULTS"; case PROTEUS_ANALOG_PWM_TEST: return "PROTEUS_ANALOG_PWM_TEST"; +case PROTEUS_DEFAULTS: + return "PROTEUS_DEFAULTS"; case PROTEUS_MIATA_NB2: return "PROTEUS_MIATA_NB2"; case PROTEUS_QC_TEST_BOARD: diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 94542ce293..d90c9bfe6a 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 Feb 02 14:16:48 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3802,4 +3802,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 Feb 02 14:16:48 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 6284a54bdd..1be40ee05f 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 Feb 02 14:16:48 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021 // 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 4ba000ae2a..977b609864 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 Feb 02 14:16:48 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021 // 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 7f90a2bede..bae57d34ff 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 Feb 02 14:16:48 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021 // 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 b956af1293..fa0e855297 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 Feb 02 14:16:48 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021 // 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 6f848d4e80..915203d80f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -402,7 +402,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST" #define engineChartSize_offset 1480 #define engineCode_offset 1128 #define engineConfiguration_offset 0 @@ -440,6 +440,7 @@ #define ET_MRE_NEW_TEST_BOARD 31 #define ET_MRE_OLD_TEST_BOARD 30 #define ET_MRE_SUBARU_EJ18 37 +#define ET_PROTEUS_ANALOG_PWM_TEST 106 #define ET_PROTEUS_BMW_M73 63 #define ET_PROTEUS_MIATA_NB2 67 #define ET_PROTEUS_QC_TEST_BOARD 42 @@ -1253,8 +1254,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 937064025 +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 920683779 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1588,7 +1589,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.02.02.all.937064025" +#define TS_SIGNATURE "rusEFI 2021.02.03.all.920683779" #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 b7a1a231bb..ab8726ee47 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 937064025 -#define TS_SIGNATURE "rusEFI 2021.02.02.all.937064025" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 920683779 +#define TS_SIGNATURE "rusEFI 2021.02.03.all.920683779" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index f15aaea671..4acdcb8b56 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 3013630922 -#define TS_SIGNATURE "rusEFI 2021.02.02.frankenso_na6.3013630922" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 2996480144 +#define TS_SIGNATURE "rusEFI 2021.02.03.frankenso_na6.2996480144" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 04d9e9c78b..23e0bbf3a9 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 630075105 -#define TS_SIGNATURE "rusEFI 2021.02.02.hellen72.630075105" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 615833019 +#define TS_SIGNATURE "rusEFI 2021.02.03.hellen72.615833019" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index b9b4c58337..bb875dd60f 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1973857673 -#define TS_SIGNATURE "rusEFI 2021.02.02.hellen_cypress.1973857673" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 1956404947 +#define TS_SIGNATURE "rusEFI 2021.02.03.hellen_cypress.1956404947" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 1b73eb7986..56e06c7f40 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1973857673 -#define TS_SIGNATURE "rusEFI 2021.02.02.kin.1973857673" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 1956404947 +#define TS_SIGNATURE "rusEFI 2021.02.03.kin.1956404947" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index e3c5a8149a..a0c3769427 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 421266611 -#define TS_SIGNATURE "rusEFI 2021.02.02.mre_f4.421266611" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 405207017 +#define TS_SIGNATURE "rusEFI 2021.02.03.mre_f4.405207017" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 6c0ae893dd..14791adc12 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 421266611 -#define TS_SIGNATURE "rusEFI 2021.02.02.mre_f7.421266611" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 405207017 +#define TS_SIGNATURE "rusEFI 2021.02.03.mre_f7.405207017" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 7af0bbc0f4..ac67d006d1 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 625767535 -#define TS_SIGNATURE "rusEFI 2021.02.02.prometheus_405.625767535" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 611747637 +#define TS_SIGNATURE "rusEFI 2021.02.03.prometheus_405.611747637" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index aa6b81a935..6cf4635601 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 625767535 -#define TS_SIGNATURE "rusEFI 2021.02.02.prometheus_469.625767535" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 611747637 +#define TS_SIGNATURE "rusEFI 2021.02.03.prometheus_469.611747637" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 81c1b7ad50..e3a0b36451 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1357626998 -#define TS_SIGNATURE "rusEFI 2021.02.02.proteus_f4.1357626998" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 1372671276 +#define TS_SIGNATURE "rusEFI 2021.02.03.proteus_f4.1372671276" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0ef62f287b..c8c07611f7 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.02.02 -#define SIGNATURE_HASH 1357626998 -#define TS_SIGNATURE "rusEFI 2021.02.02.proteus_f7.1357626998" +#define SIGNATURE_DATE 2021.02.03 +#define SIGNATURE_HASH 1372671276 +#define TS_SIGNATURE "rusEFI 2021.02.03.proteus_f7.1372671276" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 2d6a1db6ef05cdf7c090a6823be7820523310d58..5605963f4607f9684dde8e2d2657f65ac591b8e1 100644 GIT binary patch delta 243606 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⁢CzXWKGUyn%DY! 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 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 752a535b77..2f7328ffb2 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.all.937064025" + signature = "rusEFI 2021.02.03.all.920683779" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.all.937064025" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.all.920683779" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:16:48 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 428ca87d4e..16d26126e3 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.frankenso_na6.3013630922" + signature = "rusEFI 2021.02.03.frankenso_na6.2996480144" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.frankenso_na6.3013630922" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.frankenso_na6.2996480144" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:16:56 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:10 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index ab322bcb3b..5e06f03d5c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.hellen72.630075105" + signature = "rusEFI 2021.02.03.hellen72.615833019" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.hellen72.630075105" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.hellen72.615833019" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:16:50 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:05 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 e992393d6e..7d02ea9489 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.hellen_cypress.1973857673" + signature = "rusEFI 2021.02.03.hellen_cypress.1956404947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.hellen_cypress.1973857673" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.hellen_cypress.1956404947" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:17:12 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Feb 03 19:36:27 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 f45262f714..bffca604eb 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.kin.1973857673" + signature = "rusEFI 2021.02.03.kin.1956404947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.kin.1973857673" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.kin.1956404947" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:17:10 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Feb 03 19:36:26 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 da973c6ab6..3a8bfdea2b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.mre_f4.421266611" + signature = "rusEFI 2021.02.03.mre_f4.405207017" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.mre_f4.421266611" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.mre_f4.405207017" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:16:54 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:08 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 6d21d73ca5..ddfd7ebf99 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.mre_f7.421266611" + signature = "rusEFI 2021.02.03.mre_f7.405207017" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.mre_f7.421266611" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.mre_f7.405207017" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:16:52 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:06 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 e11bb7c9be..6c556e8d8a 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.prometheus_405.625767535" + signature = "rusEFI 2021.02.03.prometheus_405.611747637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.prometheus_405.625767535" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.prometheus_405.611747637" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:17:04 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:21 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 d280fa96d5..d28e0968de 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.prometheus_469.625767535" + signature = "rusEFI 2021.02.03.prometheus_469.611747637" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.prometheus_469.625767535" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.prometheus_469.611747637" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:16:57 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:12 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 cd32bb962b..843b0d897f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.proteus_f4.1357626998" + signature = "rusEFI 2021.02.03.proteus_f4.1372671276" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.proteus_f4.1357626998" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.proteus_f4.1372671276" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:17:08 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:24 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 81c45f1831..16bedc3736 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.02.02.proteus_f7.1357626998" + signature = "rusEFI 2021.02.03.proteus_f7.1372671276" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.02.02.proteus_f7.1357626998" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.02.03.proteus_f7.1372671276" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,11 +77,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 Feb 02 14:17:07 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:22 UTC 2021 pageSize = 20000 page = 1 -engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "INVALID", "NISSAN_PRIMERA", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "INVALID", "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", "HELLEN_NB2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "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", "PROTEUS_ANALOG_PWM_TEST", "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 9fec4ced8a..073f401dbd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 10:46:27 PST 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index e034772ed6..4d689ab73f 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +