diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index c2ea3e7ff5..7a5cb04705 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 Thu Oct 28 13:21:58 EDT 2021 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Fri Nov 05 11:17:43 UTC 2021 // see also gen_config_and_enums.bat @@ -431,6 +431,8 @@ case TT_MIATA_VVT: return "TT_MIATA_VVT"; case TT_MITSUBISHI: return "TT_MITSUBISHI"; +case TT_NISSAN_MR18_CRANK: + return "TT_NISSAN_MR18_CRANK"; case TT_NISSAN_QR25: return "TT_NISSAN_QR25"; case TT_NISSAN_SR20VE: diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index ef5acf2211..a236323b3e 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 03:36:10 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 11:18:29 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 d5ff2a8b88..83da7d313d 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 03:36:10 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 11:18:29 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 b9c6ef9caf..e518c0eee0 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 03:36:10 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 11:18:29 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 5352232726..af603c5e01 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 03:36:10 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 11:18:29 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 f068d3d56d..5f4025ed7c 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 1856319244 -#define TS_SIGNATURE "rusEFI 2021.11.05.all.1856319244" +#define SIGNATURE_HASH 37212184 +#define TS_SIGNATURE "rusEFI 2021.11.05.all.37212184" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index b384af5efa..a076170c74 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 1919932971 -#define TS_SIGNATURE "rusEFI 2021.11.05.atlas.1919932971" +#define SIGNATURE_HASH 519906623 +#define TS_SIGNATURE "rusEFI 2021.11.05.atlas.519906623" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 884d5ae037..5626474233 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 1856319244 -#define TS_SIGNATURE "rusEFI 2021.11.05.f429-discovery.1856319244" +#define SIGNATURE_HASH 37212184 +#define TS_SIGNATURE "rusEFI 2021.11.05.f429-discovery.37212184" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index fe6b1b1009..981d55d488 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 345471717 -#define TS_SIGNATURE "rusEFI 2021.11.05.frankenso_na6.345471717" +#define SIGNATURE_HASH 2013627889 +#define TS_SIGNATURE "rusEFI 2021.11.05.frankenso_na6.2013627889" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index f692cd2bd4..a2a278fa26 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 151169317 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen-nb1.151169317" +#define SIGNATURE_HASH 1703958065 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen-nb1.1703958065" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 53594c7fe4..c71238d111 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 3847518030 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121nissan.3847518030" +#define SIGNATURE_HASH 2311489626 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121nissan.2311489626" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index d621cb4bd3..2f754b5577 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 1028247370 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121vag.1028247370" +#define SIGNATURE_HASH 1373319262 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121vag.1373319262" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 5521df398d..e371de6e49 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 3097835484 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen128.3097835484" +#define SIGNATURE_HASH 3560425672 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen128.3560425672" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index a5fa25f01f..f9b517569b 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 718965046 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen154hyundai.718965046" +#define SIGNATURE_HASH 1179153954 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen154hyundai.1179153954" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 48e9f84933..5449140875 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 137383723 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen72.137383723" +#define SIGNATURE_HASH 1688383551 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen72.1688383551" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 45f701ee5d..9390226dc4 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 2552615905 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen88bmw.2552615905" +#define SIGNATURE_HASH 4105645301 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen88bmw.4105645301" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 4f6deac73a..82c03d5783 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 3757909506 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellenNA6.3757909506" +#define SIGNATURE_HASH 3010451734 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellenNA6.3010451734" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 411bb3cd7a..29e19bfa9e 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 592091035 -#define TS_SIGNATURE "rusEFI 2021.11.05.hellen_cypress.592091035" +#define SIGNATURE_HASH 1339582607 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen_cypress.1339582607" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index eebc831405..2bd539ca2d 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 3706674023 -#define TS_SIGNATURE "rusEFI 2021.11.05.kin.3706674023" +#define SIGNATURE_HASH 2961024115 +#define TS_SIGNATURE "rusEFI 2021.11.05.kin.2961024115" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 55954bae6d..d5f1411f8e 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 3862247576 -#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f4.3862247576" +#define SIGNATURE_HASH 2326251404 +#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f4.2326251404" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index cab55540df..c2714cf0b9 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 3862247576 -#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f7.3862247576" +#define SIGNATURE_HASH 2326251404 +#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f7.2326251404" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 23e62cabbe..ee63e8a51e 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 1045427946 -#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_405.1045427946" +#define SIGNATURE_HASH 1390217726 +#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_405.1390217726" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 32d9b8a2f0..246b6b6fcb 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 1045427946 -#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_469.1045427946" +#define SIGNATURE_HASH 1390217726 +#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_469.1390217726" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index ef1ec9b6c9..eecc62c839 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 4030818256 -#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f4.4030818256" +#define SIGNATURE_HASH 2631112900 +#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f4.2631112900" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index a7f6a8a039..947509048f 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 4030818256 -#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f7.4030818256" +#define SIGNATURE_HASH 2631112900 +#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f7.2631112900" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 8e93c5ab30..5b88f722a0 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 4106004264 -#define TS_SIGNATURE "rusEFI 2021.11.05.subaru_eg33_f7.4106004264" +#define SIGNATURE_HASH 2553174076 +#define TS_SIGNATURE "rusEFI 2021.11.05.subaru_eg33_f7.2553174076" 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 36b1470355..8a2dcae87c 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 @@ -72,6 +72,7 @@ public enum trigger_type_e { TT_FORD_TFI_PIP, TT_SUZUKI_G13B, TT_HONDA_K_4_1, + TT_NISSAN_MR18_CRANK, TT_UNUSED, Force_4_bytes_size_trigger_type, }