diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index 4f0b2dba1a..3d00ae4e17 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "engine_types.h" -// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sun Oct 24 09:12:05 EDT 2021 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sun Oct 24 17:16:22 UTC 2021 // see also gen_config_and_enums.bat @@ -128,8 +128,6 @@ case BMW_M73_MRE: return "BMW_M73_MRE"; case BMW_M73_MRE_SLAVE: return "BMW_M73_MRE_SLAVE"; -case PROTEUS_BMW_M73: - return "BMW_M73_PROTEUS"; case CAMARO_4: return "CAMARO_4"; case CITROEN_TU3JP: @@ -280,6 +278,8 @@ case PROMETHEUS_DEFAULTS: return "PROMETHEUS_DEFAULTS"; case PROTEUS_ANALOG_PWM_TEST: return "PROTEUS_ANALOG_PWM_TEST"; +case PROTEUS_BMW_M73: + return "PROTEUS_BMW_M73"; case PROTEUS_DEFAULTS: return "PROTEUS_DEFAULTS"; case PROTEUS_HONDA_ELEMENT_2003: diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 2f651f4558..7ed0282c7e 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 14:15:37 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 17:17:01 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 46d25c6b0c..ba5a3c665f 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 14:15:37 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 17:17:01 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 6c07e58312..dc34758b24 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 14:15:37 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 17:17:01 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 331c56eb91..6364209a8b 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 14:15:37 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Oct 24 17:17:01 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index e4066a90e6..a32872a6b6 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 1116555577 -#define TS_SIGNATURE "rusEFI 2021.10.24.all.1116555577" +#define SIGNATURE_HASH 3863329661 +#define TS_SIGNATURE "rusEFI 2021.10.24.all.3863329661" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 8a81de6e1e..73cc7b30d2 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD atlas #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 1116555577 -#define TS_SIGNATURE "rusEFI 2021.10.24.atlas.1116555577" +#define SIGNATURE_HASH 3863329661 +#define TS_SIGNATURE "rusEFI 2021.10.24.atlas.3863329661" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index efdf295e96..7bc0685d56 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD f429-discovery #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 1116555577 -#define TS_SIGNATURE "rusEFI 2021.10.24.f429-discovery.1116555577" +#define SIGNATURE_HASH 3863329661 +#define TS_SIGNATURE "rusEFI 2021.10.24.f429-discovery.3863329661" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7aabd726a6..d6d95b9eeb 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 952048848 -#define TS_SIGNATURE "rusEFI 2021.10.24.frankenso_na6.952048848" +#define SIGNATURE_HASH 2625105556 +#define TS_SIGNATURE "rusEFI 2021.10.24.frankenso_na6.2625105556" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 76484890f2..b5e9d8fd30 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen-nb1 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 3992913657 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen-nb1.3992913657" +#define SIGNATURE_HASH 1228403901 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen-nb1.1228403901" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index f6eb7c900d..50c98429dd 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 3380351355 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen121nissan.3380351355" +#define SIGNATURE_HASH 1840571199 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen121nissan.1840571199" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 48ba7c37e3..73149bc616 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 291613055 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen121vag.291613055" +#define SIGNATURE_HASH 3047775035 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen121vag.3047775035" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 3d3430425d..0633e7d949 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 2492289513 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen128.2492289513" +#define SIGNATURE_HASH 809870253 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen128.809870253" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index f023271436..dc401912d3 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen154hyundai #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 116584195 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen154hyundai.116584195" +#define SIGNATURE_HASH 2721717575 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen154hyundai.2721717575" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index d74cd1ee7f..9d9207b29f 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 605563166 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen72.605563166" +#define SIGNATURE_HASH 2161171290 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen72.2161171290" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 4504bcfd82..2353d963c6 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen88bmw #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 3020797396 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen88bmw.3020797396" +#define SIGNATURE_HASH 281364368 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen88bmw.281364368" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 18fe827f2a..ab5904796f 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 3024560341 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellenNA6.3024560341" +#define SIGNATURE_HASH 277861009 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellenNA6.277861009" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 3a0026e8a8..6bf1d1ba0c 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 15831785 -#define TS_SIGNATURE "rusEFI 2021.10.24.hellen_cypress.15831785" +#define SIGNATURE_HASH 2755223725 +#define TS_SIGNATURE "rusEFI 2021.10.24.hellen_cypress.2755223725" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index d4e13a116a..7ae7cd0d66 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 4283719189 -#define TS_SIGNATURE "rusEFI 2021.10.24.kin.4283719189" +#define SIGNATURE_HASH 1536994385 +#define TS_SIGNATURE "rusEFI 2021.10.24.kin.1536994385" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index b2348655e9..74ae2bf9ee 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 3390922413 -#define TS_SIGNATURE "rusEFI 2021.10.24.mre_f4.3390922413" +#define SIGNATURE_HASH 1859497193 +#define TS_SIGNATURE "rusEFI 2021.10.24.mre_f4.1859497193" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 019a2865f5..cf402c7c0c 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 3390922413 -#define TS_SIGNATURE "rusEFI 2021.10.24.mre_f7.3390922413" +#define SIGNATURE_HASH 1859497193 +#define TS_SIGNATURE "rusEFI 2021.10.24.mre_f7.1859497193" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 024ce46599..af8ff05c9a 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 308777183 -#define TS_SIGNATURE "rusEFI 2021.10.24.prometheus_405.308777183" +#define SIGNATURE_HASH 3064947355 +#define TS_SIGNATURE "rusEFI 2021.10.24.prometheus_405.3064947355" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index fbac8f9527..f26797579d 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 308777183 -#define TS_SIGNATURE "rusEFI 2021.10.24.prometheus_469.308777183" +#define SIGNATURE_HASH 3064947355 +#define TS_SIGNATURE "rusEFI 2021.10.24.prometheus_469.3064947355" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5157591686..82aa48426b 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 2143386452 -#define TS_SIGNATURE "rusEFI 2021.10.24.proteus_f4.2143386452" +#define SIGNATURE_HASH 3674835216 +#define TS_SIGNATURE "rusEFI 2021.10.24.proteus_f4.3674835216" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0da077fc5b..5a38ba45d3 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 2143386452 -#define TS_SIGNATURE "rusEFI 2021.10.24.proteus_f7.2143386452" +#define SIGNATURE_HASH 3674835216 +#define TS_SIGNATURE "rusEFI 2021.10.24.proteus_f7.3674835216" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 14aae01b99..e6a06f8f80 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.10.24 -#define SIGNATURE_HASH 3607601754 -#define TS_SIGNATURE "rusEFI 2021.10.24.subaru_eg33_f7.3607601754" +#define SIGNATURE_HASH 1942966302 +#define TS_SIGNATURE "rusEFI 2021.10.24.subaru_eg33_f7.1942966302" diff --git a/java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java b/java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java index d0184e3074..303a732b85 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/engine_type_e.java @@ -67,7 +67,7 @@ public enum engine_type_e { MICRO_RUS_EFI, PROTEUS_DEFAULTS, VW_B6, - BMW_M73_PROTEUS, + PROTEUS_BMW_M73, DODGE_RAM, CITROEN_TU3JP, MRE_MIATA_NA6_MAP,