From 8cbb1e5b5a49eb885036bf9dcf4efeff4f46c5de Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 4 Aug 2021 01:56:55 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/generated/signature_all.h | 6 +++--- .../controllers/generated/signature_atlas.h | 6 +++--- .../generated/signature_f429-discovery.h | 6 +++--- .../generated/signature_frankenso_na6.h | 6 +++--- .../generated/signature_hellen121nissan.h | 6 +++--- .../generated/signature_hellen121vag.h | 6 +++--- .../generated/signature_hellen128.h | 6 +++--- .../generated/signature_hellen72.h | 6 +++--- .../generated/signature_hellenNA6.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 +++--- .../generated/signature_subaru_eg33_f7.h | 6 +++--- firmware/tunerstudio/generated/cache.zip | Bin 1791479 -> 1791983 bytes firmware/tunerstudio/generated/rusefi.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 18 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 18 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 18 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 18 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 18 +++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 18 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 18 +++++++++--------- .../generated/rusefi_hellen_cypress.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_kinetis.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 18 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 18 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 18 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 18 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 18 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 18 +++++++++--------- 37 files changed, 216 insertions(+), 216 deletions(-) diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 11880d58ae..d382256e19 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.08.03 -#define SIGNATURE_HASH 3060452824 -#define TS_SIGNATURE "rusEFI 2021.08.03.all.3060452824" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 1247230726 +#define TS_SIGNATURE "rusEFI 2021.08.04.all.1247230726" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index fec4dadcfa..704c1fc42c 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD atlas -#define SIGNATURE_DATE 2021.08.03 -#define SIGNATURE_HASH 3060452824 -#define TS_SIGNATURE "rusEFI 2021.08.03.atlas.3060452824" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 1247230726 +#define TS_SIGNATURE "rusEFI 2021.08.04.atlas.1247230726" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 995b460670..803b6a78b1 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD f429-discovery -#define SIGNATURE_DATE 2021.08.03 -#define SIGNATURE_HASH 3060452824 -#define TS_SIGNATURE "rusEFI 2021.08.03.f429-discovery.3060452824" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 1247230726 +#define TS_SIGNATURE "rusEFI 2021.08.04.f429-discovery.1247230726" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 3cc94ea454..9fdafa1e7f 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.08.03 -#define SIGNATURE_HASH 3428358193 -#define TS_SIGNATURE "rusEFI 2021.08.03.frankenso_na6.3428358193" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 811953903 +#define TS_SIGNATURE "rusEFI 2021.08.04.frankenso_na6.811953903" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 555f4eeb44..368ec00df5 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121nissan -#define SIGNATURE_DATE 2021.08.03 -#define SIGNATURE_HASH 2653265574 -#define TS_SIGNATURE "rusEFI 2021.08.03.hellen121nissan.2653265574" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 1645766776 +#define TS_SIGNATURE "rusEFI 2021.08.04.hellen121nissan.1645766776" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 0321f26fa1..4a9fe70653 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121vag -#define SIGNATURE_DATE 2021.08.03 -#define SIGNATURE_HASH 3464065422 -#define TS_SIGNATURE "rusEFI 2021.08.03.hellen121vag.3464065422" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 843351888 +#define TS_SIGNATURE "rusEFI 2021.08.04.hellen121vag.843351888" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index d3e6e989d8..0c9decd0d6 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.08.03 -#define SIGNATURE_HASH 2440044567 -#define TS_SIGNATURE "rusEFI 2021.08.03.hellen128.2440044567" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 1833817801 +#define TS_SIGNATURE "rusEFI 2021.08.04.hellen128.1833817801" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index ab5cd9818d..c45fe860c4 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.08.03 -#define SIGNATURE_HASH 1005656324 -#define TS_SIGNATURE "rusEFI 2021.08.03.hellen72.1005656324" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 3352096730 +#define TS_SIGNATURE "rusEFI 2021.08.04.hellen72.3352096730" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 0e6d389ed3..0f2bd460f2 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellenNA6 -#define SIGNATURE_DATE 2021.08.03 -#define SIGNATURE_HASH 1456438079 -#define TS_SIGNATURE "rusEFI 2021.08.03.hellenNA6.1456438079" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 2868022753 +#define TS_SIGNATURE "rusEFI 2021.08.04.hellenNA6.2868022753" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index c99fe71588..25aa176aea 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.08.03 -#define SIGNATURE_HASH 4095088136 -#define TS_SIGNATURE "rusEFI 2021.08.03.hellen_cypress.4095088136" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 137093334 +#define TS_SIGNATURE "rusEFI 2021.08.04.hellen_cypress.137093334" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 53ebe77559..d1e694f278 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.08.03 -#define SIGNATURE_HASH 196336372 -#define TS_SIGNATURE "rusEFI 2021.08.03.kin.196336372" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 4153289770 +#define TS_SIGNATURE "rusEFI 2021.08.04.kin.4153289770" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 9c541c2ecc..1af2ca8c6b 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.08.03 -#define SIGNATURE_HASH 1461125353 -#define TS_SIGNATURE "rusEFI 2021.08.03.mre_f4.1461125353" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 2871719479 +#define TS_SIGNATURE "rusEFI 2021.08.04.mre_f4.2871719479" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 33c8f148eb..ad3e9015f6 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.08.03 -#define SIGNATURE_HASH 1461125353 -#define TS_SIGNATURE "rusEFI 2021.08.03.mre_f7.1461125353" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 2871719479 +#define TS_SIGNATURE "rusEFI 2021.08.04.mre_f7.2871719479" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ad8cf8e3f3..02b6e2af7d 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.08.03 -#define SIGNATURE_HASH 3867153470 -#define TS_SIGNATURE "rusEFI 2021.08.03.prometheus_405.3867153470" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 448652000 +#define TS_SIGNATURE "rusEFI 2021.08.04.prometheus_405.448652000" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 45b860eec4..2e74a698d5 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.08.03 -#define SIGNATURE_HASH 3867153470 -#define TS_SIGNATURE "rusEFI 2021.08.03.prometheus_469.3867153470" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 448652000 +#define TS_SIGNATURE "rusEFI 2021.08.04.prometheus_469.448652000" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 83ed9336c8..f4ec87ba41 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.08.03 -#define SIGNATURE_HASH 1876429187 -#define TS_SIGNATURE "rusEFI 2021.08.03.proteus_f4.1876429187" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 2481323869 +#define TS_SIGNATURE "rusEFI 2021.08.04.proteus_f4.2481323869" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index f3d97189ce..5b91c5aaee 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.08.03 -#define SIGNATURE_HASH 1876429187 -#define TS_SIGNATURE "rusEFI 2021.08.03.proteus_f7.1876429187" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 2481323869 +#define TS_SIGNATURE "rusEFI 2021.08.04.proteus_f7.2481323869" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 394532634a..b53d8455b7 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.08.03 -#define SIGNATURE_HASH 1892353134 -#define TS_SIGNATURE "rusEFI 2021.08.03.subaru_eg33_f7.1892353134" +#define SIGNATURE_DATE 2021.08.04 +#define SIGNATURE_HASH 2364994224 +#define TS_SIGNATURE "rusEFI 2021.08.04.subaru_eg33_f7.2364994224" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 612933e173bf72e847145c6c069c47d9fd9804ad..c9dcea62656be57a1753a3ea9b50b8391ac1ea57 100644 GIT binary patch delta 340484 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 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index bfacf33379..48b2549f3b 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.08.03.all.3060452824" + signature = "rusEFI 2021.08.04.all.1247230726" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.all.3060452824" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.all.1247230726" ; 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 Aug 03 09:33:12 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:49 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3449,14 +3449,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index ea3bd2f6f5..9236406adc 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.08.03.atlas.3060452824" + signature = "rusEFI 2021.08.04.atlas.1247230726" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.atlas.3060452824" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.atlas.1247230726" ; 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 Aug 03 09:33:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:46 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3449,14 +3449,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 0807b2f19f..e4a5253519 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.08.03.f429-discovery.3060452824" + signature = "rusEFI 2021.08.04.f429-discovery.1247230726" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.f429-discovery.3060452824" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.f429-discovery.1247230726" ; 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 Aug 03 09:32:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55: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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3449,14 +3449,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8b985e3d1c..339fc79640 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.08.03.frankenso_na6.3428358193" + signature = "rusEFI 2021.08.04.frankenso_na6.811953903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.frankenso_na6.3428358193" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.frankenso_na6.811953903" ; 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 Aug 03 09:32:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:32 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3449,14 +3449,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 0aa0bcd020..c073dc5be9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.08.03.hellen121nissan.2653265574" + signature = "rusEFI 2021.08.04.hellen121nissan.1645766776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.hellen121nissan.2653265574" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.hellen121nissan.1645766776" ; 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 Aug 03 09:32:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:17 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3445,14 +3445,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 08cbaf1c6f..1539519c5a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.08.03.hellen121vag.3464065422" + signature = "rusEFI 2021.08.04.hellen121vag.843351888" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.hellen121vag.3464065422" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.hellen121vag.843351888" ; 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 Aug 03 09:32:46 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:14 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3445,14 +3445,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 7cc050326a..47be2cea77 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.08.03.hellen128.2440044567" + signature = "rusEFI 2021.08.04.hellen128.1833817801" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.hellen128.2440044567" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.hellen128.1833817801" ; 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 Aug 03 09:32:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:11 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3445,14 +3445,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index b44e57e1d6..f3d51d7395 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.08.03.hellen72.1005656324" + signature = "rusEFI 2021.08.04.hellen72.3352096730" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.hellen72.1005656324" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.hellen72.3352096730" ; 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 Aug 03 09:32:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:20 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3445,14 +3445,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 26954f222c..cca524f647 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.08.03.hellenNA6.1456438079" + signature = "rusEFI 2021.08.04.hellenNA6.2868022753" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.hellenNA6.1456438079" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.hellenNA6.2868022753" ; 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 Aug 03 09:32:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:23 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3445,14 +3445,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 6567fe392a..2553d38c88 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.08.03.hellen_cypress.4095088136" + signature = "rusEFI 2021.08.04.hellen_cypress.137093334" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.hellen_cypress.4095088136" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.hellen_cypress.137093334" ; 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 Aug 03 09:33:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 04 01:55:54 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3449,14 +3449,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 5d8748f5a8..6175517020 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.08.03.kin.196336372" + signature = "rusEFI 2021.08.04.kin.4153289770" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.kin.196336372" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.kin.4153289770" ; 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 Aug 03 09:33:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 04 01:55:51 UTC 2021 pageSize = 19972 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3421,14 +3421,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal panel = triggerInputComparator diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index f94f4c6486..a103ed14e0 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.08.03.mre_f4.1461125353" + signature = "rusEFI 2021.08.04.mre_f4.2871719479" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.mre_f4.1461125353" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.mre_f4.2871719479" ; 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 Aug 03 09:32:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:29 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3445,14 +3445,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index e42e230950..24124a4c25 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.08.03.mre_f7.1461125353" + signature = "rusEFI 2021.08.04.mre_f7.2871719479" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.mre_f7.1461125353" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.mre_f7.2871719479" ; 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 Aug 03 09:32:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55: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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3445,14 +3445,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 7461bf3db3..67f219128f 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.08.03.prometheus_405.3867153470" + signature = "rusEFI 2021.08.04.prometheus_405.448652000" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.prometheus_405.3867153470" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.prometheus_405.448652000" ; 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 Aug 03 09:33:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:37 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3444,14 +3444,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 057e3c3233..d192d1bccd 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.08.03.prometheus_469.3867153470" + signature = "rusEFI 2021.08.04.prometheus_469.448652000" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.prometheus_469.3867153470" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.prometheus_469.448652000" ; 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 Aug 03 09:33:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:35 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3444,14 +3444,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d4b9a15b92..8a6b463a29 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.08.03.proteus_f4.1876429187" + signature = "rusEFI 2021.08.04.proteus_f4.2481323869" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.proteus_f4.1876429187" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.proteus_f4.2481323869" ; 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 Aug 03 09:33:08 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:43 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3442,14 +3442,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 6fdd8158f0..fbddb3706d 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.08.03.proteus_f7.1876429187" + signature = "rusEFI 2021.08.04.proteus_f7.2481323869" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.proteus_f7.1876429187" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.proteus_f7.2481323869" ; 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 Aug 03 09:33:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:40 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3442,14 +3442,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 1b17dca818..6a6a70b2d0 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.08.03.subaru_eg33_f7.1892353134" + signature = "rusEFI 2021.08.04.subaru_eg33_f7.2364994224" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.08.03.subaru_eg33_f7.1892353134" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.08.04.subaru_eg33_f7.2364994224" ; 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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Aug 03 09:33:18 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Aug 04 01:55:57 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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "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", "TEST_ROTARY", "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", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES", "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", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG", "HELLEN_121_NISSAN", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI", "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", "TEST_ROTARY", "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, 30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2 injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0, 20, 2 @@ -3445,14 +3445,14 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "#Cam is primary if you have cam sensor as part of trigger shape" field = "Primary channel", triggerInputPins1 field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 } + field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } + field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } field = "Invert cam inputs", invertCamVVTSignal