diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index 411cee4e37..031dc4e4ab 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -135,14 +135,14 @@ jobs: m74_9, s105, t-b-g, - hellen72, hellen81, hellen88bmw, hellen88bmw_avr, - hellen-nb1, + hellenMiataNA6, + hellenMiataNA96, + hellenMiataNB1, + hellenMiataNB2, hellen-gm-e67, - hellenNA8_96, - hellenNA6, hellen128, hellen121vag, hellen-honda-k, @@ -173,10 +173,6 @@ jobs: include: # Board configurations # 'target' should match corresponding SHORT_BOARD_NAME - - build-target: hellen72 - folder: config/boards/hellen/hellen72 - skip-rate: 90 - - build-target: hellen81 folder: config/boards/hellen/hellen81 skip-rate: 90 @@ -238,10 +234,6 @@ jobs: folder: config/boards/hellen/hellen88bmw skip-rate: 99 - - build-target: hellen-nb1 - folder: config/boards/hellen/hellen-nb1 - skip-rate: 99 - - build-target: hellen-112-17 folder: config/boards/hellen/hellen-112-17 skip-rate: 50 @@ -254,13 +246,21 @@ jobs: folder: config/boards/hellen/hellen-gm-e67 skip-rate: 99 - - build-target: hellenNA8_96 - folder: config/boards/hellen/hellenNA8_96 + - build-target: hellenMiataNA6 + folder: config/boards/hellen/hellenMiataNA6 skip-rate: 99 - - build-target: hellenNA6 - folder: config/boards/hellen/hellen64_miataNA6_94 - skip-rate: 90 + - build-target: hellenMiataNA96 + folder: config/boards/hellen/hellenMiataNA96 + skip-rate: 99 + + - build-target: hellenMiataNB1 + folder: config/boards/hellen/hellenMiataNB1 + skip-rate: 99 + + - build-target: hellenMiataNB2 + folder: config/boards/hellen/hellenMiataNB2 + skip-rate: 99 - build-target: hellen128 folder: config/boards/hellen/hellen128 diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/!compile_hellenNA6.bat b/firmware/config/boards/hellen/hellenMiataNA6/!compile_hellenNA6.bat similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/!compile_hellenNA6.bat rename to firmware/config/boards/hellen/hellenMiataNA6/!compile_hellenNA6.bat diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk b/firmware/config/boards/hellen/hellenMiataNA6/board.mk similarity index 95% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk rename to firmware/config/boards/hellen/hellenMiataNA6/board.mk index b68b84dcc8..40f03a1c81 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk +++ b/firmware/config/boards/hellen/hellenMiataNA6/board.mk @@ -17,4 +17,6 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DDISABLE_PIN_STATE_VALIDATION=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA6 +DDEFS += -DHW_HELLEN_MIATA_NA6=1 + include $(BOARDS_DIR)/hellen/hellen-common176.mk diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp b/firmware/config/boards/hellen/hellenMiataNA6/board_configuration.cpp similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp rename to firmware/config/boards/hellen/hellenMiataNA6/board_configuration.cpp diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh b/firmware/config/boards/hellen/hellenMiataNA6/compile_hellenNA6.sh similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh rename to firmware/config/boards/hellen/hellenMiataNA6/compile_hellenNA6.sh diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/64pin-176122-6.jpg b/firmware/config/boards/hellen/hellenMiataNA6/connectors/64pin-176122-6.jpg similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/64pin-176122-6.jpg rename to firmware/config/boards/hellen/hellenMiataNA6/connectors/64pin-176122-6.jpg diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/generated_outputs.h b/firmware/config/boards/hellen/hellenMiataNA6/connectors/generated_outputs.h similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/generated_outputs.h rename to firmware/config/boards/hellen/hellenMiataNA6/connectors/generated_outputs.h diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/generated_ts_name_by_pin.cpp b/firmware/config/boards/hellen/hellenMiataNA6/connectors/generated_ts_name_by_pin.cpp similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/generated_ts_name_by_pin.cpp rename to firmware/config/boards/hellen/hellenMiataNA6/connectors/generated_ts_name_by_pin.cpp diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/main.yaml b/firmware/config/boards/hellen/hellenMiataNA6/connectors/main.yaml similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/connectors/main.yaml rename to firmware/config/boards/hellen/hellenMiataNA6/connectors/main.yaml diff --git a/firmware/config/boards/hellen/hellen-nb1/knock_config.h b/firmware/config/boards/hellen/hellenMiataNA6/knock_config.h similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/knock_config.h rename to firmware/config/boards/hellen/hellenMiataNA6/knock_config.h diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/meta-info.env b/firmware/config/boards/hellen/hellenMiataNA6/meta-info.env similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/meta-info.env rename to firmware/config/boards/hellen/hellenMiataNA6/meta-info.env diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/prepend.txt b/firmware/config/boards/hellen/hellenMiataNA6/prepend.txt similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/prepend.txt rename to firmware/config/boards/hellen/hellenMiataNA6/prepend.txt diff --git a/firmware/config/boards/hellen/hellenNA8_96/board.mk b/firmware/config/boards/hellen/hellenMiataNA96/board.mk similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/board.mk rename to firmware/config/boards/hellen/hellenMiataNA96/board.mk diff --git a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp b/firmware/config/boards/hellen/hellenMiataNA96/board_configuration.cpp similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp rename to firmware/config/boards/hellen/hellenMiataNA96/board_configuration.cpp diff --git a/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh b/firmware/config/boards/hellen/hellenMiataNA96/compile_hellenNA8_96.sh similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh rename to firmware/config/boards/hellen/hellenMiataNA96/compile_hellenNA8_96.sh diff --git a/firmware/config/boards/hellen/hellenNA8_96/connectors/generated_outputs.h b/firmware/config/boards/hellen/hellenMiataNA96/connectors/generated_outputs.h similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/connectors/generated_outputs.h rename to firmware/config/boards/hellen/hellenMiataNA96/connectors/generated_outputs.h diff --git a/firmware/config/boards/hellen/hellenNA8_96/connectors/generated_ts_name_by_pin.cpp b/firmware/config/boards/hellen/hellenMiataNA96/connectors/generated_ts_name_by_pin.cpp similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/connectors/generated_ts_name_by_pin.cpp rename to firmware/config/boards/hellen/hellenMiataNA96/connectors/generated_ts_name_by_pin.cpp diff --git a/firmware/config/boards/hellen/hellen-nb1/connectors/main.jpg b/firmware/config/boards/hellen/hellenMiataNA96/connectors/main.jpg similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/connectors/main.jpg rename to firmware/config/boards/hellen/hellenMiataNA96/connectors/main.jpg diff --git a/firmware/config/boards/hellen/hellenNA8_96/connectors/main.yaml b/firmware/config/boards/hellen/hellenMiataNA96/connectors/main.yaml similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/connectors/main.yaml rename to firmware/config/boards/hellen/hellenMiataNA96/connectors/main.yaml diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/knock_config.h b/firmware/config/boards/hellen/hellenMiataNA96/knock_config.h similarity index 100% rename from firmware/config/boards/hellen/hellen64_miataNA6_94/knock_config.h rename to firmware/config/boards/hellen/hellenMiataNA96/knock_config.h diff --git a/firmware/config/boards/hellen/hellenNA8_96/meta-info.env b/firmware/config/boards/hellen/hellenMiataNA96/meta-info.env similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/meta-info.env rename to firmware/config/boards/hellen/hellenMiataNA96/meta-info.env diff --git a/firmware/config/boards/hellen/hellenNA8_96/prepend.txt b/firmware/config/boards/hellen/hellenMiataNA96/prepend.txt similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/prepend.txt rename to firmware/config/boards/hellen/hellenMiataNA96/prepend.txt diff --git a/firmware/config/boards/hellen/hellen-nb1/board.mk b/firmware/config/boards/hellen/hellenMiataNB1/board.mk similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/board.mk rename to firmware/config/boards/hellen/hellenMiataNB1/board.mk diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellenMiataNB1/board_configuration.cpp similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp rename to firmware/config/boards/hellen/hellenMiataNB1/board_configuration.cpp diff --git a/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh b/firmware/config/boards/hellen/hellenMiataNB1/compile_hellen-nb1.sh similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh rename to firmware/config/boards/hellen/hellenMiataNB1/compile_hellen-nb1.sh diff --git a/firmware/config/boards/hellen/hellen-nb1/connectors/generated_outputs.h b/firmware/config/boards/hellen/hellenMiataNB1/connectors/generated_outputs.h similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/connectors/generated_outputs.h rename to firmware/config/boards/hellen/hellenMiataNB1/connectors/generated_outputs.h diff --git a/firmware/config/boards/hellen/hellen-nb1/connectors/generated_ts_name_by_pin.cpp b/firmware/config/boards/hellen/hellenMiataNB1/connectors/generated_ts_name_by_pin.cpp similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/connectors/generated_ts_name_by_pin.cpp rename to firmware/config/boards/hellen/hellenMiataNB1/connectors/generated_ts_name_by_pin.cpp diff --git a/firmware/config/boards/hellen/hellenNA8_96/connectors/main.jpg b/firmware/config/boards/hellen/hellenMiataNB1/connectors/main.jpg similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/connectors/main.jpg rename to firmware/config/boards/hellen/hellenMiataNB1/connectors/main.jpg diff --git a/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml b/firmware/config/boards/hellen/hellenMiataNB1/connectors/main.yaml similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml rename to firmware/config/boards/hellen/hellenMiataNB1/connectors/main.yaml diff --git a/firmware/config/boards/hellen/hellen72/knock_config.h b/firmware/config/boards/hellen/hellenMiataNB1/knock_config.h similarity index 100% rename from firmware/config/boards/hellen/hellen72/knock_config.h rename to firmware/config/boards/hellen/hellenMiataNB1/knock_config.h diff --git a/firmware/config/boards/hellen/hellen-nb1/meta-info.env b/firmware/config/boards/hellen/hellenMiataNB1/meta-info.env similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/meta-info.env rename to firmware/config/boards/hellen/hellenMiataNB1/meta-info.env diff --git a/firmware/config/boards/hellen/hellen-nb1/prepend.txt b/firmware/config/boards/hellen/hellenMiataNB1/prepend.txt similarity index 100% rename from firmware/config/boards/hellen/hellen-nb1/prepend.txt rename to firmware/config/boards/hellen/hellenMiataNB1/prepend.txt diff --git a/firmware/config/boards/hellen/hellen72/!compile_hellen72.bat b/firmware/config/boards/hellen/hellenMiataNB2/!compile_hellen72.bat similarity index 100% rename from firmware/config/boards/hellen/hellen72/!compile_hellen72.bat rename to firmware/config/boards/hellen/hellenMiataNB2/!compile_hellen72.bat diff --git a/firmware/config/boards/hellen/hellen72/board.mk b/firmware/config/boards/hellen/hellenMiataNB2/board.mk similarity index 100% rename from firmware/config/boards/hellen/hellen72/board.mk rename to firmware/config/boards/hellen/hellenMiataNB2/board.mk diff --git a/firmware/config/boards/hellen/hellen72/board_configuration.cpp b/firmware/config/boards/hellen/hellenMiataNB2/board_configuration.cpp similarity index 100% rename from firmware/config/boards/hellen/hellen72/board_configuration.cpp rename to firmware/config/boards/hellen/hellenMiataNB2/board_configuration.cpp diff --git a/firmware/config/boards/hellen/hellen72/compile_hellen72.sh b/firmware/config/boards/hellen/hellenMiataNB2/compile_hellen72.sh similarity index 100% rename from firmware/config/boards/hellen/hellen72/compile_hellen72.sh rename to firmware/config/boards/hellen/hellenMiataNB2/compile_hellen72.sh diff --git a/firmware/config/boards/hellen/hellen72/connectors/generated_outputs.h b/firmware/config/boards/hellen/hellenMiataNB2/connectors/generated_outputs.h similarity index 100% rename from firmware/config/boards/hellen/hellen72/connectors/generated_outputs.h rename to firmware/config/boards/hellen/hellenMiataNB2/connectors/generated_outputs.h diff --git a/firmware/config/boards/hellen/hellen72/connectors/generated_ts_name_by_pin.cpp b/firmware/config/boards/hellen/hellenMiataNB2/connectors/generated_ts_name_by_pin.cpp similarity index 100% rename from firmware/config/boards/hellen/hellen72/connectors/generated_ts_name_by_pin.cpp rename to firmware/config/boards/hellen/hellenMiataNB2/connectors/generated_ts_name_by_pin.cpp diff --git a/firmware/config/boards/hellen/hellen72/connectors/main.jpg b/firmware/config/boards/hellen/hellenMiataNB2/connectors/main.jpg similarity index 100% rename from firmware/config/boards/hellen/hellen72/connectors/main.jpg rename to firmware/config/boards/hellen/hellenMiataNB2/connectors/main.jpg diff --git a/firmware/config/boards/hellen/hellen72/connectors/main.yaml b/firmware/config/boards/hellen/hellenMiataNB2/connectors/main.yaml similarity index 100% rename from firmware/config/boards/hellen/hellen72/connectors/main.yaml rename to firmware/config/boards/hellen/hellenMiataNB2/connectors/main.yaml diff --git a/firmware/config/boards/hellen/hellenNA8_96/knock_config.h b/firmware/config/boards/hellen/hellenMiataNB2/knock_config.h similarity index 100% rename from firmware/config/boards/hellen/hellenNA8_96/knock_config.h rename to firmware/config/boards/hellen/hellenMiataNB2/knock_config.h diff --git a/firmware/config/boards/hellen/hellen72/meta-info.env b/firmware/config/boards/hellen/hellenMiataNB2/meta-info.env similarity index 100% rename from firmware/config/boards/hellen/hellen72/meta-info.env rename to firmware/config/boards/hellen/hellenMiataNB2/meta-info.env diff --git a/firmware/config/boards/hellen/hellen72/prepend.txt b/firmware/config/boards/hellen/hellenMiataNB2/prepend.txt similarity index 100% rename from firmware/config/boards/hellen/hellen72/prepend.txt rename to firmware/config/boards/hellen/hellenMiataNB2/prepend.txt diff --git a/firmware/config/boards/hellen/hellen72/readme.md b/firmware/config/boards/hellen/hellenMiataNB2/readme.md similarity index 100% rename from firmware/config/boards/hellen/hellen72/readme.md rename to firmware/config/boards/hellen/hellenMiataNB2/readme.md diff --git a/firmware/config/boards/hellen/uaefi/board_configuration.cpp b/firmware/config/boards/hellen/uaefi/board_configuration.cpp index beae69fdd7..9729ed146c 100644 --- a/firmware/config/boards/hellen/uaefi/board_configuration.cpp +++ b/firmware/config/boards/hellen/uaefi/board_configuration.cpp @@ -162,5 +162,13 @@ Gpio* getBoardMetaOutputs() { } int getBoardMetaDcOutputsCount() { + if (engineConfiguration->engineType == engine_type_e::HONDA_OBD1 || + engineConfiguration->engineType == engine_type_e::MAZDA_MIATA_NA6 || + engineConfiguration->engineType == engine_type_e::MAZDA_MIATA_NA94 || + engineConfiguration->engineType == engine_type_e::MAZDA_MIATA_NA96 || + engineConfiguration->engineType == engine_type_e::MAZDA_MIATA_NB1 || + engineConfiguration->engineType == engine_type_e::MAZDA_MIATA_NB2) { + return 0; + } return 2; } diff --git a/firmware/config/engines/mazda/mazda_miata_1_6.cpp b/firmware/config/engines/mazda/mazda_miata_1_6.cpp index 609d13478e..3b40beebd0 100644 --- a/firmware/config/engines/mazda/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda/mazda_miata_1_6.cpp @@ -267,7 +267,7 @@ void setMiataNA6_MAP_Frankenso() { engineConfiguration->ignitionPins[3] = Gpio::Unassigned; } -void setHellenNA94() { +void setMazdaMiataNA94() { miataNAcommonEngineSettings(); strcpy(engineConfiguration->engineCode, "94"); /** @@ -285,10 +285,12 @@ void setHellenNA94() { engineConfiguration->fan2OnTemperature = 95; engineConfiguration->fan2OffTemperature = 91; +#if HW_HELLEN_MIATA_NA6 engineConfiguration->fan2Pin = Gpio::D9; // 3S - A/C Fan 94-95 +#endif //HW_HELLEN_MIATA_NA6 } -void setHellenNA6() { +void setMazdaMiataNA6() { miataNAcommonEngineSettings(); engineConfiguration->map.sensor.type = MT_MPX4250; } diff --git a/firmware/config/engines/mazda/mazda_miata_1_6.h b/firmware/config/engines/mazda/mazda_miata_1_6.h index 6b8cb88507..be0953451c 100644 --- a/firmware/config/engines/mazda/mazda_miata_1_6.h +++ b/firmware/config/engines/mazda/mazda_miata_1_6.h @@ -22,6 +22,6 @@ void miataNAcommonEngineSettings(); /** * set engine_type 34 */ -void setHellenNA6(); +void setMazdaMiataNA6(); -void setHellenNA94(); +void setMazdaMiataNA94(); diff --git a/firmware/config/engines/mazda/mazda_miata_vvt.cpp b/firmware/config/engines/mazda/mazda_miata_vvt.cpp index 78c08b0976..e1df335aec 100644 --- a/firmware/config/engines/mazda/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda/mazda_miata_vvt.cpp @@ -451,10 +451,12 @@ void setMiataNB2_Proteus_TCU() { #endif // HW_PROTEUS #if HW_HELLEN -static void setMazdaMiataEngineNB1Defaults() { +void setMazdaMiataNB1() { setCommonMazdaNB(); strcpy(engineConfiguration->engineCode, "NB1"); + engineConfiguration->injector.flow = 256; + // Vehicle speed/gears engineConfiguration->totalGearsCount = 5; engineConfiguration->gearRatio[0] = 3.136; @@ -468,13 +470,7 @@ static void setMazdaMiataEngineNB1Defaults() { engineConfiguration->finalGearRatio = 4.3; } -void setHellenNB1() { - setMazdaMiataEngineNB1Defaults(); - - engineConfiguration->injector.flow = 256; -} - -void setMiataNB2_Hellen72() { +void setMazdaMiataNB2() { setMazdaMiataEngineNB2Defaults(); strcpy(engineConfiguration->vehicleName, "H72 test"); @@ -484,8 +480,8 @@ void setMiataNB2_Hellen72() { } -void setMiataNB2_Hellen72_36() { - setMiataNB2_Hellen72(); +void setMazdaMiataNB2_36() { + setMazdaMiataNB2(); engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_36_1; engineConfiguration->globalTriggerAngleOffset = 76; diff --git a/firmware/config/engines/mazda/mazda_miata_vvt.h b/firmware/config/engines/mazda/mazda_miata_vvt.h index 94762abe91..95b2d495be 100644 --- a/firmware/config/engines/mazda/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda/mazda_miata_vvt.h @@ -17,12 +17,11 @@ */ void setMiataNB2_Proteus_TCU(); +void setMazdaMiataNB1(); /** * set engine_type 69 */ -void setMiataNB2_Hellen72(); - -void setMiataNB2_Hellen72_36(); +void setMazdaMiataNB2(); +void setMazdaMiataNB2_36(); -void setHellenNB1(); diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 9aaa283b48..1987fee970 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -756,6 +756,27 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e break; #endif +#if HW_HELLEN + case engine_type_e::MAZDA_MIATA_NA96: + setMazdaMiata96(); + break; + case engine_type_e::MAZDA_MIATA_NA6: + setMazdaMiataNA6(); + break; + case engine_type_e::MAZDA_MIATA_NA94: + setMazdaMiataNA94(); + break; + case engine_type_e::MAZDA_MIATA_NB1: + setMazdaMiataNB1(); + break; + case engine_type_e::MAZDA_MIATA_NB2: + setMazdaMiataNB2(); + break; + case engine_type_e::MAZDA_MIATA_NB2_36: + setMazdaMiataNB2_36(); + break; +#endif + #if HW_PROTEUS case engine_type_e::MAVERICK_X3: setMaverickX3(); @@ -851,21 +872,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e break; #endif -#if HW_HELLEN_NB1 - case engine_type_e::MAZDA_MIATA_NB1: - setHellenNB1(); - break; -#endif - -#if HW_HELLEN_NB2 - case engine_type_e::MAZDA_MIATA_NB2: - setMiataNB2_Hellen72(); - break; - case engine_type_e::MAZDA_MIATA_NB2_36: - setMiataNB2_Hellen72_36(); - break; -#endif - #if HW_HELLEN_121_VAG case engine_type_e::HELLEN_121_VAG_5_CYL: setHellen121Vag_5_cyl(); @@ -889,18 +895,9 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case engine_type_e::TOYOTA_1NZ_FE: setToyota1NZFE(); break; - case engine_type_e::MAZDA_MIATA_NA96: - setMazdaMiata96(); - break; case engine_type_e::HELLEN_121_VAG_4_CYL: case engine_type_e::HELLEN_154_VAG: break; - case engine_type_e::MAZDA_MIATA_NA6: - setHellenNA6(); - break; - case engine_type_e::MAZDA_MIATA_NA94: - setHellenNA94(); - break; case engine_type_e::HELLEN_HONDA_BCM: setHondaCivicBcm(); break; diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 37f83fa444..f3cbaa417f 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -193,7 +193,7 @@ enum class engine_type_e : uint16_t { UNUSED93 = 93, - HELLEN_NB1_36 = 94, + UNUSED94 = 94, HELLEN_154_HYUNDAI_COUPE_BK2 = 95, diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh index b985d063c5..7067ce2f15 100755 --- a/firmware/gen_config.sh +++ b/firmware/gen_config.sh @@ -42,15 +42,16 @@ for BOARD in \ "config/boards/hellen/hellen88bmw hellen88bmw" \ "config/boards/hellen/uaefi uaefi" \ "config/boards/hellen/hellen-112-17 hellen-112-17" \ - "config/boards/hellen/hellen72 hellen72" \ "config/boards/hellen/hellen81 hellen81" \ - "config/boards/hellen/hellen-nb1 hellen-nb1" \ + "config/boards/hellen/hellenMiataNA6 hellenMiataNA6" \ + "config/boards/hellen/hellenMiataNA96 hellenMiataNA96" \ + "config/boards/hellen/hellenMiataNB1 hellenMiataNB1" \ + "config/boards/hellen/hellenMiataNB2 hellenMiataNB2" \ "config/boards/hellen/hellen-gm-e67 hellen-gm-e67" \ - "config/boards/hellen/hellen64_miataNA6_94 hellenNA6" \ - "config/boards/hellen/hellenNA8_96 hellenNA8_96" \ "config/boards/hellen/small-can-board small-can-board" \ "config/boards/microrusefi mre_f7" \ "config/boards/microrusefi mre_f4" \ + "config/boards/at_start_f435 at_start_f435" \ "config/boards/m74_9 m74_9" \ "config/boards/s105 s105" \ "config/boards/test-build-guards t-b-g" \ @@ -60,6 +61,7 @@ for BOARD in \ "config/boards/proteus proteus_f7" \ "config/boards/proteus proteus_f4" \ "config/boards/proteus proteus_h7" \ + "config/boards/f407-discovery f407-discovery" \ "config/boards/f429-discovery f429-discovery" \ "config/boards/f469-discovery f469-discovery" \ "config/boards/nucleo_f413 stm32f413_nucleo" \ @@ -68,8 +70,6 @@ for BOARD in \ "config/boards/nucleo_h743 nucleo_h743" \ "config/boards/atlas atlas"\ "config/boards/tdg-pdm8 tdg-pdm8"\ - "config/boards/f407-discovery f407-discovery" \ - "config/boards/at_start_f435 at_start_f435" \ ; do BOARD_DIR=$(echo "$BOARD" | cut -d " " -f 1) SHORT_BOARD_NAME=$(echo "$BOARD" | cut -d " " -f 2) diff --git a/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java b/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java index fb49993025..a44eb43c2a 100644 --- a/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java +++ b/java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java @@ -179,6 +179,7 @@ public class CommonFunctionalTest extends RusefiTestBase { ecu.setEngineType(engine_type_e.SACHS); ecu.changeRpm(1200); } + @Test public void test2003DodgeNeon() { ecu.setEngineType(engine_type_e.DODGE_NEON_2003_CRANK); diff --git a/java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java b/java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java index 617daf2651..e65f3b74c8 100644 --- a/java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java +++ b/java_console/models/src/main/java/com/rusefi/enums/engine_type_e.java @@ -99,7 +99,7 @@ public enum engine_type_e { HONDA_OBD2A, SIMULATOR_CONFIG, UNUSED93, - HELLEN_NB1_36, + UNUSED94, HELLEN_154_HYUNDAI_COUPE_BK2, WASTEGATE_PROTEUS_TEST, UNUSED_97, diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java index 374ca97004..0bed012f9c 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java @@ -121,7 +121,7 @@ public class ReaderStateImpl implements ReaderState { try (BufferedReader definitionReader = new BufferedReader(readerProvider.read(fileNameWithRoot))) { readBufferedReader(definitionReader, destinations); } catch (Throwable e) { - throw new IllegalStateException("While processing " + fileNameWithRoot); + throw new IllegalStateException("While processing " + fileNameWithRoot, e); } if (destCDefinesFileName != null) {