From 2a8720838094bab2c47cd74d4d8157b04f524695 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 11 Oct 2021 12:37:24 -0400 Subject: [PATCH] hyundai --- .../config/boards/hellen/hellen154hyundai/board.mk | 2 +- firmware/config/engines/engines.mk | 1 + firmware/config/engines/hyundai.cpp | 8 ++++++++ firmware/config/engines/hyundai.h | 10 ++++++++++ firmware/controllers/algo/engine_configuration.cpp | 3 ++- firmware/integration/rusefi_config.txt | 1 - 6 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 firmware/config/engines/hyundai.cpp create mode 100644 firmware/config/engines/hyundai.h diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk index ed0198cfb2..36eaba3b23 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board.mk +++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk @@ -6,7 +6,7 @@ BOARDINC = $(BOARDS_DIR)/hellen/hellen154hyundai # Set this if you want a default engine type other than normal hellen121nissan ifeq ($(DEFAULT_ENGINE_TYPE),) - DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_154_HYUNDAI + DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_154_HYUNDAI_COUPE_BK2 endif # 144 package MCU diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index e0703daa71..bc131fdb76 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -22,6 +22,7 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/honda_accord.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 \ diff --git a/firmware/config/engines/hyundai.cpp b/firmware/config/engines/hyundai.cpp new file mode 100644 index 0000000000..1b5c4f97a3 --- /dev/null +++ b/firmware/config/engines/hyundai.cpp @@ -0,0 +1,8 @@ +/* + * @file hyundai.cpp + * + * @date Oct 11, 2021 + * @author Andrey Belomutskiy, (c) 2012-2021 + */ + +#include "hyundai.h" diff --git a/firmware/config/engines/hyundai.h b/firmware/config/engines/hyundai.h new file mode 100644 index 0000000000..6adb3438d5 --- /dev/null +++ b/firmware/config/engines/hyundai.h @@ -0,0 +1,10 @@ +/* + * @file hyundai.h + * + * @date Oct 11, 2021 + * @author Andrey Belomutskiy, (c) 2012-2021 + */ + +#pragma once + +#include "engine_configuration.h" diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index cfb8853b56..e247173e59 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -988,7 +988,8 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case HELLEN_88_BMW: case HELLEN_134_BMW: case HELLEN_154_VAG: - case HELLEN_154_HYUNDAI: + case HELLEN_154_HYUNDAI_COUPE_BK1: + case HELLEN_154_HYUNDAI_COUPE_BK2: break; case HELLEN_NA6: setHellenNA6(PASS_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 8cd74b99fe..1678f1bd0f 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -534,7 +534,6 @@ end_struct #define ET_HELLEN_NA94 80 #define ET_HELLEN_121_VAG_8_CYL 81 -#define ET_HELLEN_154_HYUNDAI 82 #define ET_HELLEN_154_HYUNDAI_COUPE_BK1 82 #define ET_HELLEN_NB1 83 #define ET_HELLEN_121_NISSAN_4_CYL 84