diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index e97728efdd..13bdbcc624 100644 --- a/firmware/controllers/algo/auto_generated_commonenum.cpp +++ b/firmware/controllers/algo/auto_generated_commonenum.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "rusefi_enums.h" -// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Oct 28 15:52:40 EDT 2021 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri Nov 05 19:39:49 UTC 2021 // see also gen_config_and_enums.bat @@ -684,6 +684,8 @@ case VVT_INACTIVE: return "VVT_INACTIVE"; case VVT_MIATA_NB2: return "VVT_MIATA_NB2"; +case VVT_NISSAN_MR: + return "VVT_NISSAN_MR"; case VVT_NISSAN_VQ: return "VVT_NISSAN_VQ"; case VVT_SECOND_HALF: diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index 7a5cb04705..10f61eb816 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 Fri Nov 05 11:17:43 UTC 2021 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Fri Nov 05 19:39:49 UTC 2021 // see also gen_config_and_enums.bat @@ -363,8 +363,6 @@ case TT_36_2_2_2: return "TT_36_2_2_2"; case TT_3_1_CAM: return "TT_3_1_CAM"; -case TT_52: - return "TT_52"; case TT_60_2_VW: return "TT_60_2_VW"; case TT_CHRYSLER_NGC_36_2_2: @@ -431,6 +429,8 @@ case TT_MIATA_VVT: return "TT_MIATA_VVT"; case TT_MITSUBISHI: return "TT_MITSUBISHI"; +case TT_NISSAN_MR18_CAM_VVT: + return "TT_NISSAN_MR18_CAM_VVT"; case TT_NISSAN_MR18_CRANK: return "TT_NISSAN_MR18_CRANK"; case TT_NISSAN_QR25: @@ -467,8 +467,6 @@ case TT_SUBARU_SVX_CRANK_1: return "TT_SUBARU_SVX_CRANK_1"; case TT_SUZUKI_G13B: return "TT_SUZUKI_G13B"; -case TT_TEMP_62: - return "TT_TEMP_62"; case TT_TOOTHED_WHEEL: return "TT_TOOTHED_WHEEL"; case TT_TOOTHED_WHEEL_36_1: @@ -483,6 +481,8 @@ case TT_UNUSED: return "TT_UNUSED"; case TT_UNUSED_10: return "TT_UNUSED_10"; +case TT_UNUSED_62: + return "TT_UNUSED_62"; case TT_VVT_BARRA_3_PLUS_1: return "TT_VVT_BARRA_3_PLUS_1"; case TT_VVT_BOSCH_QUICK_START: diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index e23265a37a..da822c96b6 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 Fri Nov 05 18:39:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 19:40:36 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 a00f8c5384..df533087ff 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 Fri Nov 05 18:39:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 19:40:36 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 5c5c2e5ec5..92eb090900 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 Fri Nov 05 18:39:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 19:40:36 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 25fbcca355..279b0ad79b 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 Fri Nov 05 18:39:03 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 19:40:36 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 46fcc0986c..5335494bd1 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.11.05 -#define SIGNATURE_HASH 2817133922 -#define TS_SIGNATURE "rusEFI 2021.11.05.all.2817133922" +#define SIGNATURE_HASH 868765903 +#define TS_SIGNATURE "rusEFI 2021.11.05.all.868765903" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ef48a8b9ec..aa2c1cca38 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.11.05 -#define SIGNATURE_HASH 3139500101 -#define TS_SIGNATURE "rusEFI 2021.11.05.atlas.3139500101" +#define SIGNATURE_HASH 788702696 +#define TS_SIGNATURE "rusEFI 2021.11.05.atlas.788702696" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 6cfa8dcdc0..603d74d182 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.11.05 -#define SIGNATURE_HASH 2817133922 -#define TS_SIGNATURE "rusEFI 2021.11.05.f429-discovery.2817133922" +#define SIGNATURE_HASH 868765903 +#define TS_SIGNATURE "rusEFI 2021.11.05.f429-discovery.868765903" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 69ee5e33a5..f3158b3529 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.11.05 -#define SIGNATURE_HASH 3721943179 -#define TS_SIGNATURE "rusEFI 2021.11.05.frankenso_na6.3721943179" +#define SIGNATURE_HASH 1241122086 +#define TS_SIGNATURE "rusEFI 2021.11.05.frankenso_na6.1241122086" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 23c3beb325..4cda27cf3c 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.11.05 -#define SIGNATURE_HASH 3226307403 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen-nb1.3226307403" +#define SIGNATURE_HASH 1416615654 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen-nb1.1416615654" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index b03900fb2d..bca3ecc0d4 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.11.05 -#define SIGNATURE_HASH 739988768 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121nissan.739988768" +#define SIGNATURE_HASH 3090745485 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121nissan.3090745485" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 9d69df9bff..c753c30031 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.11.05 -#define SIGNATURE_HASH 4094094628 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121vag.4094094628" +#define SIGNATURE_HASH 1613017225 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121vag.1613017225" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 9583f0fd85..a324552011 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.11.05 -#define SIGNATURE_HASH 1911166386 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen128.1911166386" +#define SIGNATURE_HASH 3855108127 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen128.3855108127" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index f883ff9b2d..0b1f8da1f3 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.11.05 -#define SIGNATURE_HASH 3818236760 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen154hyundai.3818236760" +#define SIGNATURE_HASH 2008545013 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen154hyundai.2008545013" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 82dc04e97a..e5ad7d6949 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.11.05 -#define SIGNATURE_HASH 3246353733 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen72.3246353733" +#define SIGNATURE_HASH 1432170728 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen72.1432170728" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 02560d5eb2..e61731bc89 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.11.05 -#define SIGNATURE_HASH 1365963151 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen88bmw.1365963151" +#define SIGNATURE_HASH 3309874210 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen88bmw.3309874210" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 798942a2eb..a3a185c390 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.11.05 -#define SIGNATURE_HASH 380765292 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellenNA6.380765292" +#define SIGNATURE_HASH 2190498241 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellenNA6.2190498241" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index dc33c15c58..4e76a54598 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.11.05 -#define SIGNATURE_HASH 3926242805 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen_cypress.3926242805" +#define SIGNATURE_HASH 2116544600 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen_cypress.2116544600" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 88adf7deb1..702a02e21e 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.11.05 -#define SIGNATURE_HASH 362838281 -#define TS_SIGNATURE "rusEFI 2021.11.05.kin.362838281" +#define SIGNATURE_HASH 2172789924 +#define TS_SIGNATURE "rusEFI 2021.11.05.kin.2172789924" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 87725b8fa4..6c1d401308 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.11.05 -#define SIGNATURE_HASH 796531446 -#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f4.796531446" +#define SIGNATURE_HASH 3143124827 +#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f4.3143124827" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 50db3871a5..6e35d90b86 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.11.05 -#define SIGNATURE_HASH 796531446 -#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f7.796531446" +#define SIGNATURE_HASH 3143124827 +#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f7.3143124827" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index dc0280264d..8fc3c6f8db 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.11.05 -#define SIGNATURE_HASH 4144026756 -#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_405.4144026756" +#define SIGNATURE_HASH 1663207721 +#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_405.1663207721" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 1e340e2543..72a90ec947 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.11.05 -#define SIGNATURE_HASH 4144026756 -#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_469.4144026756" +#define SIGNATURE_HASH 1663207721 +#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_469.1663207721" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index cdc97bc001..359d2eb9bc 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.11.05 -#define SIGNATURE_HASH 957236670 -#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f4.957236670" +#define SIGNATURE_HASH 2905348115 +#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f4.2905348115" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index f313552a8b..a5ac92c027 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.11.05 -#define SIGNATURE_HASH 957236670 -#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f7.957236670" +#define SIGNATURE_HASH 2905348115 +#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f7.2905348115" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 3ebd06def2..0f7c845930 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.11.05 -#define SIGNATURE_HASH 1039369542 -#define TS_SIGNATURE "rusEFI 2021.11.05.subaru_eg33_f7.1039369542" +#define SIGNATURE_HASH 2849102059 +#define TS_SIGNATURE "rusEFI 2021.11.05.subaru_eg33_f7.2849102059" diff --git a/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java b/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java index 8a2dcae87c..21eb42bebe 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java @@ -56,7 +56,7 @@ public enum trigger_type_e { TT_SUBARU_SVX, TT_1_16, TT_SUBARU_7_WITHOUT_6, - TT_52, + TT_NISSAN_MR18_CAM_VVT, TT_TRI_TACH, TT_GM_60_2_2_2, TT_SKODA_FAVORIT, @@ -66,7 +66,7 @@ public enum trigger_type_e { TT_VVT_NISSAN_VQ35, TT_NISSAN_VQ30, TT_NISSAN_QR25, - TT_TEMP_62, + TT_UNUSED_62, TT_SUBARU_SVX_CRANK_1, TT_SUBARU_SVX_CAM_VVT, TT_FORD_TFI_PIP,