diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index 362543bbc4..a5c5c68ebf 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 Wed May 18 03:18:14 UTC 2022 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Sat May 21 05:55:45 UTC 2022 // see also gen_config_and_enums.bat @@ -293,6 +293,8 @@ case MRE_SECONDARY_CAN: return "MRE_SECONDARY_CAN"; case MRE_SUBARU_EJ18: return "MRE_SUBARU_EJ18"; +case MRE_VW_B6: + return "MRE_VW_B6"; case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROTEUS_ANALOG_PWM_TEST: @@ -317,6 +319,8 @@ case PROTEUS_QC_TEST_BOARD: return "PROTEUS_QC_TEST_BOARD"; case PROTEUS_VAG_80_18T: return "PROTEUS_VAG_80_18T"; +case PROTEUS_VW_B6: + return "PROTEUS_VW_B6"; case SACHS: return "SACHS"; case SUBARUEG33_DEFAULTS: @@ -351,14 +355,10 @@ case TOYOTA_2JZ_GTE_VVTi: return "TOYOTA_2JZ_GTE_VVTi"; case TOYOTA_JZS147: return "TOYOTA_JZS147"; -case PROTEUS_VW_B6: - return "UNUSED39"; case UNUSED_48: return "UNUSED_48"; case VW_ABA: return "VW_ABA"; -case MRE_VW_B6: - return "VW_B6"; } return NULL; } diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index af9ae1c7be..15da21407f 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 519383648 -#define TS_SIGNATURE "rusEFI 2022.05.21.all.519383648" +#define SIGNATURE_HASH 2012046518 +#define TS_SIGNATURE "rusEFI 2022.05.21.all.2012046518" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index df2ed53e6e..47612adee8 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 753383180 -#define TS_SIGNATURE "rusEFI 2022.05.21.alphax-2chan.753383180" +#define SIGNATURE_HASH 1174403546 +#define TS_SIGNATURE "rusEFI 2022.05.21.alphax-2chan.1174403546" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 6f2b201341..5a9bb2acdd 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1031390499 -#define TS_SIGNATURE "rusEFI 2022.05.21.alphax-4chan.1031390499" +#define SIGNATURE_HASH 1415678965 +#define TS_SIGNATURE "rusEFI 2022.05.21.alphax-4chan.1415678965" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 51d00214bf..1cd46b9833 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 37740359 -#define TS_SIGNATURE "rusEFI 2022.05.21.atlas.37740359" +#define SIGNATURE_HASH 1797755281 +#define TS_SIGNATURE "rusEFI 2022.05.21.atlas.1797755281" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 32d9671ef1..55007db0e2 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3893984153 -#define TS_SIGNATURE "rusEFI 2022.05.21.core8.3893984153" +#define SIGNATURE_HASH 2164340047 +#define TS_SIGNATURE "rusEFI 2022.05.21.core8.2164340047" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 81cf01b9dc..c50112f3e8 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 519383648 -#define TS_SIGNATURE "rusEFI 2022.05.21.f429-discovery.519383648" +#define SIGNATURE_HASH 2012046518 +#define TS_SIGNATURE "rusEFI 2022.05.21.f429-discovery.2012046518" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 82e51116b9..fa2133f911 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1553585828 -#define TS_SIGNATURE "rusEFI 2022.05.21.frankenso_na6.1553585828" +#define SIGNATURE_HASH 897685618 +#define TS_SIGNATURE "rusEFI 2022.05.21.frankenso_na6.897685618" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 2be3dfd52f..15d6f4fa7c 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1780053279 -#define TS_SIGNATURE "rusEFI 2022.05.21.harley81.1780053279" +#define SIGNATURE_HASH 50412489 +#define TS_SIGNATURE "rusEFI 2022.05.21.harley81.50412489" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index fb73eee2af..105d91c141 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2259190182 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen-nb1.2259190182" +#define SIGNATURE_HASH 4021342064 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen-nb1.4021342064" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index c0bf746e6e..1d1be8e323 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3028788361 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen121nissan.3028788361" +#define SIGNATURE_HASH 3718244959 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen121nissan.3718244959" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index cca4ff56a0..6947ee1fca 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1534279706 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen121vag.1534279706" +#define SIGNATURE_HASH 845876940 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen121vag.845876940" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 9ae17bda42..b934b9bf35 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1893660337 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen128.1893660337" +#define SIGNATURE_HASH 432453735 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen128.432453735" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index bfd2b8b88a..e9b9a79f96 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2260359396 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen154hyundai.2260359396" +#define SIGNATURE_HASH 4020377138 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen154hyundai.4020377138" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 2c939ac427..0188be897f 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3730129640 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen72.3730129640" +#define SIGNATURE_HASH 3075279934 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen72.3075279934" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index b973797b9b..a975b57248 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3819891405 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen81.3819891405" +#define SIGNATURE_HASH 2327225371 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen81.2327225371" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 32939dce2c..174e2b5add 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1113779396 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen88bmw.1113779396" +#define SIGNATURE_HASH 729457170 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen88bmw.729457170" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 8eae229c30..f8aa37ece3 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2625559296 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellenNA6.2625559296" +#define SIGNATURE_HASH 4117140950 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellenNA6.4117140950" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 60411c38bb..2e2e2abe48 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 599543465 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellenNA8_96.599543465" +#define SIGNATURE_HASH 1252262015 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellenNA8_96.1252262015" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 0bdd65f9b3..19b8e0cffc 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1540973674 -#define TS_SIGNATURE "rusEFI 2022.05.21.hellen_cypress.1540973674" +#define SIGNATURE_HASH 851520188 +#define TS_SIGNATURE "rusEFI 2022.05.21.hellen_cypress.851520188" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 6700f4596a..67bf0216c0 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 93979623 -#define TS_SIGNATURE "rusEFI 2022.05.21.kin.93979623" +#define SIGNATURE_HASH 1820478769 +#define TS_SIGNATURE "rusEFI 2022.05.21.kin.1820478769" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index b4f51b946a..d32db905ce 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1407683540 -#define TS_SIGNATURE "rusEFI 2022.05.21.mre_f4.1407683540" +#define SIGNATURE_HASH 989840642 +#define TS_SIGNATURE "rusEFI 2022.05.21.mre_f4.989840642" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 38698800c5..5a3ae6b26f 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1407683540 -#define TS_SIGNATURE "rusEFI 2022.05.21.mre_f7.1407683540" +#define SIGNATURE_HASH 989840642 +#define TS_SIGNATURE "rusEFI 2022.05.21.mre_f7.989840642" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 5600784d53..521a732900 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1310716806 -#define TS_SIGNATURE "rusEFI 2022.05.21.prometheus_405.1310716806" +#define SIGNATURE_HASH 654818640 +#define TS_SIGNATURE "rusEFI 2022.05.21.prometheus_405.654818640" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index d76d57295b..d49f60a688 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1310716806 -#define TS_SIGNATURE "rusEFI 2022.05.21.prometheus_469.1310716806" +#define SIGNATURE_HASH 654818640 +#define TS_SIGNATURE "rusEFI 2022.05.21.prometheus_469.654818640" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8a51dc9a02..1133e28786 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3131696648 -#define TS_SIGNATURE "rusEFI 2022.05.21.proteus_f4.3131696648" +#define SIGNATURE_HASH 3551635678 +#define TS_SIGNATURE "rusEFI 2022.05.21.proteus_f4.3551635678" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 00da25ea55..f3742d35ed 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3131696648 -#define TS_SIGNATURE "rusEFI 2022.05.21.proteus_f7.3131696648" +#define SIGNATURE_HASH 3551635678 +#define TS_SIGNATURE "rusEFI 2022.05.21.proteus_f7.3551635678" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index efcf04153b..6d4bed8339 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3131696648 -#define TS_SIGNATURE "rusEFI 2022.05.21.proteus_h7.3131696648" +#define SIGNATURE_HASH 3551635678 +#define TS_SIGNATURE "rusEFI 2022.05.21.proteus_h7.3551635678" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 4a6f479ec0..9b2ca16eb9 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 1907636961 -#define TS_SIGNATURE "rusEFI 2022.05.21.subaru_eg33_f7.1907636961" +#define SIGNATURE_HASH 413955127 +#define TS_SIGNATURE "rusEFI 2022.05.21.subaru_eg33_f7.413955127" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index b36c649fb1..e499593ac2 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3036537908 -#define TS_SIGNATURE "rusEFI 2022.05.21.tdg-pdm8.3036537908" +#define SIGNATURE_HASH 3722816226 +#define TS_SIGNATURE "rusEFI 2022.05.21.tdg-pdm8.3722816226" 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 0007e8b2bb..c19dc6fec1 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 @@ -43,7 +43,7 @@ public enum engine_type_e { HELLEN_128_MERCEDES_4_CYL, MRE_SUBARU_EJ18, TOYOTA_JZS147, - UNUSED39, + PROTEUS_VW_B6, FRANKENSO_BMW_M73_F, FRANKENSO_MIATA_NA6_MAP, PROTEUS_QC_TEST_BOARD, @@ -66,7 +66,7 @@ public enum engine_type_e { TLE8888_BENCH_ENGINE, L9779_BENCH_ENGINE, EEPROM_BENCH_ENGINE, - VW_B6, + MRE_VW_B6, PROTEUS_BMW_M73, DODGE_RAM, CITROEN_TU3JP,