From a039c52897c9c9b44df670b2206acc7dd8015e2d Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 2 Jul 2021 16:26:23 -0400 Subject: [PATCH] Nissan progress --- .../boards/hellen/hellen121nissan/board_configuration.cpp | 2 +- firmware/config/engines/engines.mk | 1 + firmware/controllers/algo/engine_configuration.cpp | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index 8eac9cf477..2b04d7e9d1 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -157,7 +157,7 @@ void setBoardDefaultConfiguration(void) { // Some sensible defaults for other options setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; + engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX); diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index 2231f533f9..8c42dfaf04 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -15,6 +15,7 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/dodge_neon.cpp \ $(PROJECT_DIR)/config/engines/ford_1995_inline_6.cpp \ $(PROJECT_DIR)/config/engines/nissan_primera.cpp \ + $(PROJECT_DIR)/config/engines/nissan_vq.cpp \ $(PROJECT_DIR)/config/engines/mazda_miata_nb.cpp \ $(PROJECT_DIR)/config/engines/honda_accord.cpp \ $(PROJECT_DIR)/config/engines/subaru.cpp \ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index f48b08f968..4e1c2217e5 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -942,9 +942,11 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case HELLEN72_ETB: setHellen72etb(PASS_CONFIG_PARAMETER_SIGNATURE); break; + case HELLEN_121_NISSAN: + setHellen121nissan(PASS_CONFIG_PARAMETER_SIGNATURE); + break; case HELLEN_128_MERCEDES: case HELLEN_121_VAG: - case HELLEN_121_NISSAN: case HELLEN_55_BMW: case HELLEN_88_BMW: case HELLEN_134_BMW: