From 56ff75004baef1dc7894bf4bd2ef610d8cb2edd0 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 23 Nov 2019 15:53:22 -0500 Subject: [PATCH] consistency --- firmware/config/engines/mazda_323.cpp | 4 +++- firmware/config/engines/mazda_323.h | 7 ++----- firmware/config/engines/nissan_primera.cpp | 15 +++++++++++---- firmware/config/engines/nissan_primera.h | 11 ++++------- .../controllers/algo/engine_configuration.cpp | 4 ++-- .../controllers/trigger/main_trigger_callback.cpp | 2 +- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/firmware/config/engines/mazda_323.cpp b/firmware/config/engines/mazda_323.cpp index 0f95cc1bcd..08056574d5 100644 --- a/firmware/config/engines/mazda_323.cpp +++ b/firmware/config/engines/mazda_323.cpp @@ -7,7 +7,9 @@ #include "mazda_323.h" -void setMazda323EngineConfiguration(engine_configuration_s *engineConfiguration) { +EXTERN_CONFIG; + +void setMazda323EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.displacement = 1.6; diff --git a/firmware/config/engines/mazda_323.h b/firmware/config/engines/mazda_323.h index e0a95883e2..ff614afc87 100644 --- a/firmware/config/engines/mazda_323.h +++ b/firmware/config/engines/mazda_323.h @@ -10,11 +10,8 @@ * @author Andrey Belomutskiy, (c) 2012-2017 */ -#ifndef MAZDA_323_H_ -#define MAZDA_323_H_ +#pragma once #include "engine_configuration.h" -void setMazda323EngineConfiguration(engine_configuration_s *engineConfiguration); - -#endif /* MAZDA_323_H_ */ +void setMazda323EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/config/engines/nissan_primera.cpp b/firmware/config/engines/nissan_primera.cpp index ea54528650..7fab2aae1c 100644 --- a/firmware/config/engines/nissan_primera.cpp +++ b/firmware/config/engines/nissan_primera.cpp @@ -1,10 +1,11 @@ /** * @file nissan_primera.cpp * - * engine_type 5 + * NISSAN_PRIMERA + * set engine_type 5 * * @date Oct 14, 2013 - * @author Andrey Belomutskiy, (c) 2012-2018 + * @author Andrey Belomutskiy, (c) 2012-2019 */ #include "global.h" @@ -12,11 +13,17 @@ #if EFI_SUPPORT_NISSAN_PRIMERA #include "nissan_primera.h" -void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfiguration) { +EXTERN_CONFIG; + +void setNissanPrimeraEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); + engineConfiguration->trigger.type = TT_NISSAN_SR20VE; + +// engineConfiguration->auxValves[0] } -void setNissanPrimeraEngineConfiguration_360(engine_configuration_s *engineConfiguration) { +void setNissanPrimeraEngineConfiguration_360(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->trigger.type = TT_NISSAN_SR20VE_360; } diff --git a/firmware/config/engines/nissan_primera.h b/firmware/config/engines/nissan_primera.h index 4d5d316e7a..17daf37936 100644 --- a/firmware/config/engines/nissan_primera.h +++ b/firmware/config/engines/nissan_primera.h @@ -2,19 +2,16 @@ * @file nissan_primera.h * * @date Oct 14, 2013 - * @author Andrey Belomutskiy, (c) 2012-2017 + * @author Andrey Belomutskiy, (c) 2012-2019 */ -#ifndef NISSAN_PRIMERA_H_ -#define NISSAN_PRIMERA_H_ +#pragma once #if EFI_SUPPORT_NISSAN_PRIMERA #include "engine_configuration.h" -void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfiguration); -void setNissanPrimeraEngineConfiguration_360(engine_configuration_s *engineConfiguration); +void setNissanPrimeraEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setNissanPrimeraEngineConfiguration_360(DECLARE_CONFIG_PARAMETER_SIGNATURE); #endif /* EFI_SUPPORT_NISSAN_PRIMERA */ - -#endif /* NISSAN_PRIMERA_H_ */ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index d64210b766..574058ae01 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1103,7 +1103,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb #endif /* EFI_SUPPORT_FORD_FIESTA */ #if EFI_SUPPORT_NISSAN_PRIMERA case NISSAN_PRIMERA: - setNissanPrimeraEngineConfiguration(engineConfiguration); + setNissanPrimeraEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; #endif case HONDA_ACCORD_CD: @@ -1163,7 +1163,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb setMazdaMiataNb1EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; case MAZDA_323: - setMazda323EngineConfiguration(engineConfiguration); + setMazda323EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; case MAZDA_626: setMazda626EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index 6bac5d4551..444d058bdf 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -494,7 +494,7 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t trgEventIndex D } if (checkIfTriggerConfigChanged(PASS_ENGINE_PARAMETER_SIGNATURE)) { - engine->ignitionEvents.isReady = false; // we need to rebuild ignition schedule + engine->ignitionEvents.isReady = false; // we need to rebuild complete ignition schedule engine->injectionEvents.isReady = false; // moved 'triggerIndexByAngle' into trigger initialization (why was it invoked from here if it's only about trigger shape & optimization?) // see initializeTriggerShape() -> prepareOutputSignals(PASS_ENGINE_PARAMETER_SIGNATURE)