From c3c539fa945772ef3fc7e4bfc6c9b39cccf4617a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 16 Jan 2024 12:16:37 -0500 Subject: [PATCH] only: just a rename to follow the convention --- firmware/config/boards/subaru_eg33/board.mk | 3 +-- firmware/controllers/algo/engine_configuration.cpp | 2 +- firmware/controllers/algo/engine_types.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk index ae65380394..27bea9fad0 100644 --- a/firmware/config/boards/subaru_eg33/board.mk +++ b/firmware/config/boards/subaru_eg33/board.mk @@ -19,8 +19,7 @@ DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SUBARU_EG33_F7 SHORT_BOARD_NAME = subaru_eg33_f7 # Override DEFAULT_ENGINE_TYPE -DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::SUBARUEG33_DEFAULTS - +DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::SUBARU_EG33 #Some options override DDEFS += -DHAL_USE_UART=FALSE diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index e94edf642d..1597d1007e 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1025,7 +1025,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e break; #endif // HW_FRANKENSO #ifdef HW_SUBARU_EG33 - case engine_type_e::SUBARUEG33_DEFAULTS: + case engine_type_e::SUBARU_EG33: setSubaruEG33Defaults(); break; #endif //HW_SUBARU_EG33 diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index e6255e8f39..66eee60ab3 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -154,7 +154,7 @@ enum class engine_type_e : uint16_t { HELLEN_NB2 = 69, - SUBARUEG33_DEFAULTS = 70, + SUBARU_EG33 = 70, HELLEN_121_VAG_4_CYL = 71, HELLEN_121_NISSAN_6_CYL = 72,