diff --git a/firmware/common.mk b/firmware/common.mk index 7062b53bb2..c43489ce61 100644 --- a/firmware/common.mk +++ b/firmware/common.mk @@ -32,6 +32,7 @@ ALLCPPSRC += \ ALLINC += \ $(CONSOLE_INC) \ $(DEVELOPMENT_DIR) \ + $(ENGINES_INC) \ $(PROJECT_DIR)/config/engines \ $(BOARDS_DIR) \ $(PROJECT_DIR)/hw_layer/algo \ diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index 76e417a4f2..2b813ad066 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -1,15 +1,16 @@ +ENGINES_INC = $(PROJECT_DIR)/config/engines/mazda/ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/custom_engine.cpp \ $(PROJECT_DIR)/config/engines/bmw_m73.cpp \ $(PROJECT_DIR)/config/engines/bmw_m73_mre.cpp \ $(PROJECT_DIR)/config/engines/bmw_n73.cpp \ - $(PROJECT_DIR)/config/engines/mazda_miata.cpp \ - $(PROJECT_DIR)/config/engines/mazda_miata_base_maps.cpp \ - $(PROJECT_DIR)/config/engines/mazda_miata_1_6.cpp \ - $(PROJECT_DIR)/config/engines/mazda_miata_na8.cpp \ - $(PROJECT_DIR)/config/engines/mazda_miata_vvt.cpp \ - $(PROJECT_DIR)/config/engines/mazda_miata_custom_hunchback.cpp \ + $(PROJECT_DIR)/config/engines/mazda/mazda_miata.cpp \ + $(PROJECT_DIR)/config/engines/mazda/mazda_miata_base_maps.cpp \ + $(PROJECT_DIR)/config/engines/mazda/mazda_miata_1_6.cpp \ + $(PROJECT_DIR)/config/engines/mazda/mazda_miata_na8.cpp \ + $(PROJECT_DIR)/config/engines/mazda/mazda_miata_vvt.cpp \ + $(PROJECT_DIR)/config/engines/mazda/mazda_miata_custom_hunchback.cpp \ $(PROJECT_DIR)/config/engines/citroenBerlingoTU3JP.cpp \ $(PROJECT_DIR)/config/engines/dodge_neon.cpp \ $(PROJECT_DIR)/config/engines/ford_1995_inline_6.cpp \ @@ -19,12 +20,13 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/nissan_vq.cpp \ $(PROJECT_DIR)/config/engines/harley.cpp \ $(PROJECT_DIR)/config/engines/mercedes.cpp \ + $(PROJECT_DIR)/config/engines/mitsubishi_3A92.cpp \ $(PROJECT_DIR)/config/engines/honda_600.cpp \ $(PROJECT_DIR)/config/engines/honda_k_dbc.cpp \ $(PROJECT_DIR)/config/engines/hyundai.cpp \ $(PROJECT_DIR)/config/engines/subaru.cpp \ $(PROJECT_DIR)/config/engines/GY6_139QMB.cpp \ - $(PROJECT_DIR)/config/engines/mazda_626.cpp \ + $(PROJECT_DIR)/config/engines/mazda/mazda_626.cpp \ $(PROJECT_DIR)/config/engines/sachs.cpp \ $(PROJECT_DIR)/config/engines/test_engine.cpp \ $(PROJECT_DIR)/config/engines/dodge_ram.cpp \ @@ -33,6 +35,7 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/vw_b6.cpp \ $(PROJECT_DIR)/config/engines/chevrolet_camaro_4.cpp \ $(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \ + $(PROJECT_DIR)/config/engines/toyota_1NZ_FE.cpp \ $(PROJECT_DIR)/config/engines/ford_festiva.cpp \ \ No newline at end of file diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda/mazda_626.cpp similarity index 100% rename from firmware/config/engines/mazda_626.cpp rename to firmware/config/engines/mazda/mazda_626.cpp diff --git a/firmware/config/engines/mazda_626.h b/firmware/config/engines/mazda/mazda_626.h similarity index 100% rename from firmware/config/engines/mazda_626.h rename to firmware/config/engines/mazda/mazda_626.h diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda/mazda_miata.cpp similarity index 100% rename from firmware/config/engines/mazda_miata.cpp rename to firmware/config/engines/mazda/mazda_miata.cpp diff --git a/firmware/config/engines/mazda_miata.h b/firmware/config/engines/mazda/mazda_miata.h similarity index 100% rename from firmware/config/engines/mazda_miata.h rename to firmware/config/engines/mazda/mazda_miata.h diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda/mazda_miata_1_6.cpp similarity index 100% rename from firmware/config/engines/mazda_miata_1_6.cpp rename to firmware/config/engines/mazda/mazda_miata_1_6.cpp diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda/mazda_miata_1_6.h similarity index 100% rename from firmware/config/engines/mazda_miata_1_6.h rename to firmware/config/engines/mazda/mazda_miata_1_6.h diff --git a/firmware/config/engines/mazda_miata_base_maps.cpp b/firmware/config/engines/mazda/mazda_miata_base_maps.cpp similarity index 100% rename from firmware/config/engines/mazda_miata_base_maps.cpp rename to firmware/config/engines/mazda/mazda_miata_base_maps.cpp diff --git a/firmware/config/engines/mazda_miata_base_maps.h b/firmware/config/engines/mazda/mazda_miata_base_maps.h similarity index 100% rename from firmware/config/engines/mazda_miata_base_maps.h rename to firmware/config/engines/mazda/mazda_miata_base_maps.h diff --git a/firmware/config/engines/mazda_miata_custom_hunchback.cpp b/firmware/config/engines/mazda/mazda_miata_custom_hunchback.cpp similarity index 100% rename from firmware/config/engines/mazda_miata_custom_hunchback.cpp rename to firmware/config/engines/mazda/mazda_miata_custom_hunchback.cpp diff --git a/firmware/config/engines/mazda_miata_na8.cpp b/firmware/config/engines/mazda/mazda_miata_na8.cpp similarity index 100% rename from firmware/config/engines/mazda_miata_na8.cpp rename to firmware/config/engines/mazda/mazda_miata_na8.cpp diff --git a/firmware/config/engines/mazda_miata_na8.h b/firmware/config/engines/mazda/mazda_miata_na8.h similarity index 100% rename from firmware/config/engines/mazda_miata_na8.h rename to firmware/config/engines/mazda/mazda_miata_na8.h diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda/mazda_miata_vvt.cpp similarity index 100% rename from firmware/config/engines/mazda_miata_vvt.cpp rename to firmware/config/engines/mazda/mazda_miata_vvt.cpp diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda/mazda_miata_vvt.h similarity index 100% rename from firmware/config/engines/mazda_miata_vvt.h rename to firmware/config/engines/mazda/mazda_miata_vvt.h diff --git a/firmware/config/engines/mitsubishi_3A92.cpp b/firmware/config/engines/mitsubishi_3A92.cpp new file mode 100644 index 0000000000..17305716aa --- /dev/null +++ b/firmware/config/engines/mitsubishi_3A92.cpp @@ -0,0 +1 @@ +#include "pch.h" \ No newline at end of file diff --git a/firmware/config/engines/toyota_1NZ_FE.cpp b/firmware/config/engines/toyota_1NZ_FE.cpp new file mode 100644 index 0000000000..17305716aa --- /dev/null +++ b/firmware/config/engines/toyota_1NZ_FE.cpp @@ -0,0 +1 @@ +#include "pch.h" \ No newline at end of file diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index 88ffbba159..a89fb79990 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -343,9 +343,9 @@ case engine_type_e::TLE8888_BENCH_ENGINE: return "TLE8888_BENCH_ENGINE"; case engine_type_e::TOYOTA_2JZ_GTE_VVTi: return "TOYOTA_2JZ_GTE_VVTi"; -case engine_type_e::UNUSED_12: +case engine_type_e::MITSUBISHI_3A92: return "UNUSED_12"; -case engine_type_e::UNUSED_13: +case engine_type_e::TOYOTA_1NZ_FE: return "UNUSED_13"; case engine_type_e::UNUSED_15: return "UNUSED_15"; diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 34ca823fad..1f89a40770 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -49,8 +49,8 @@ enum class engine_type_e : uint32_t { PROTEUS_E65_6H_MAN_IN_THE_MIDDLE = 9, HELLEN_NA8_96 = 10, FORD_COYOTE = 11, - UNUSED_12 = 12, - UNUSED_13 = 13, + MITSUBISHI_3A92 = 12, + TOYOTA_1NZ_FE = 13, MRE_MIATA_NA6_MAP = 66, UNUSED_15 = 15,