From 1afc239f3ba98ea445d8218bb22450a39f9d6bea Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 15 Sep 2016 18:02:36 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/math/engine_math.h | 2 -- .../controllers/trigger/main_trigger_callback.cpp | 1 + firmware/controllers/trigger/spark_logic.cpp | 10 ++++++++++ firmware/controllers/trigger/spark_logic.h | 15 +++++++++++++++ firmware/controllers/trigger/trigger.mk | 1 + 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 firmware/controllers/trigger/spark_logic.cpp create mode 100644 firmware/controllers/trigger/spark_logic.h diff --git a/firmware/controllers/math/engine_math.h b/firmware/controllers/math/engine_math.h index bcb6931372..a61288e198 100644 --- a/firmware/controllers/math/engine_math.h +++ b/firmware/controllers/math/engine_math.h @@ -19,8 +19,6 @@ void setAlgorithm(engine_load_mode_e algo DECLARE_ENGINE_PARAMETER_S); void findTriggerPosition( event_trigger_position_s *position, angle_t angleOffset DECLARE_ENGINE_PARAMETER_S); -int isInjectionEnabled(engine_configuration_s *engineConfiguration); - void initializeIgnitionActions(angle_t advance, angle_t dwellAngle, IgnitionEventList *list DECLARE_ENGINE_PARAMETER_S); diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index 6664bca8fe..98784e8c72 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -39,6 +39,7 @@ #include "efiGpio.h" #include "engine_math.h" #include "trigger_central.h" +#include "spark_logic.h" #include "rpm_calculator.h" #include "signal_executor.h" #include "engine_configuration.h" diff --git a/firmware/controllers/trigger/spark_logic.cpp b/firmware/controllers/trigger/spark_logic.cpp new file mode 100644 index 0000000000..27f0ed272f --- /dev/null +++ b/firmware/controllers/trigger/spark_logic.cpp @@ -0,0 +1,10 @@ +/* + * @file spark_logic.cpp + * + * @date Sep 15, 2016 + * @author Andrey Belomutskiy, (c) 2012-2016 + */ + + + + diff --git a/firmware/controllers/trigger/spark_logic.h b/firmware/controllers/trigger/spark_logic.h new file mode 100644 index 0000000000..aba8b1bf07 --- /dev/null +++ b/firmware/controllers/trigger/spark_logic.h @@ -0,0 +1,15 @@ +/* + * @file spark_logic.h + * + * @date Sep 15, 2016 + * @author Andrey Belomutskiy, (c) 2012-2016 + */ + +#ifndef CONTROLLERS_TRIGGER_SPARK_LOGIC_H_ +#define CONTROLLERS_TRIGGER_SPARK_LOGIC_H_ + +#include "engine.h" + +int isInjectionEnabled(engine_configuration_s *engineConfiguration); + +#endif /* CONTROLLERS_TRIGGER_SPARK_LOGIC_H_ */ diff --git a/firmware/controllers/trigger/trigger.mk b/firmware/controllers/trigger/trigger.mk index fd5b9660fa..0b298a1435 100644 --- a/firmware/controllers/trigger/trigger.mk +++ b/firmware/controllers/trigger/trigger.mk @@ -20,4 +20,5 @@ TRIGGER_SRC_CPP = \ $(PROJECT_DIR)/controllers/trigger/trigger_emulator_algo.cpp \ $(PROJECT_DIR)/controllers/trigger/rpm_calculator.cpp \ $(PROJECT_DIR)/controllers/trigger/trigger_central.cpp \ + $(PROJECT_DIR)/controllers/trigger/spark_logic.cpp \ $(PROJECT_DIR)/controllers/trigger/main_trigger_callback.cpp