From ae61b62e5125c4c642d435c5ce50898f5b08ad13 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 28 Oct 2018 15:07:42 -0400 Subject: [PATCH] refactoring: reducing code duplication --- firmware/controllers/trigger/trigger_structure.h | 2 ++ firmware/global.h | 1 - simulator/simulator/global.h | 1 - unit_tests/global.h | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/trigger/trigger_structure.h b/firmware/controllers/trigger/trigger_structure.h index e0e62e557f..5d8f48147b 100644 --- a/firmware/controllers/trigger/trigger_structure.h +++ b/firmware/controllers/trigger/trigger_structure.h @@ -233,4 +233,6 @@ private: void setToothedWheelConfiguration(TriggerShape *s, int total, int skipped, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX); +#define TRIGGER_SHAPE(x) ENGINE(triggerCentral.triggerShape.x) + #endif /* TRIGGER_STRUCTURE_H_ */ diff --git a/firmware/global.h b/firmware/global.h index dd5f111178..9446983d60 100644 --- a/firmware/global.h +++ b/firmware/global.h @@ -122,7 +122,6 @@ typedef unsigned int time_t; */ #define CONFIG(x) persistentState.persistentConfiguration.engineConfiguration.x #define ENGINE(x) _engine.x -#define TRIGGER_SHAPE(x) _engine.triggerCentral.triggerShape.x #else #define EXTERN_ENGINE diff --git a/simulator/simulator/global.h b/simulator/simulator/global.h index 4c13401479..6f38dc46f5 100644 --- a/simulator/simulator/global.h +++ b/simulator/simulator/global.h @@ -109,7 +109,6 @@ void applyNewConfiguration(void); #define CONFIG(x) persistentState.persistentConfiguration.engineConfiguration.x #define ENGINE(x) engine->x -#define TRIGGER_SHAPE(x) engine->triggerCentral.triggerShape.x #endif /* GLOBAL_H_ */ diff --git a/unit_tests/global.h b/unit_tests/global.h index 81c4df6851..8a97908284 100644 --- a/unit_tests/global.h +++ b/unit_tests/global.h @@ -98,6 +98,5 @@ class Engine; #define CONFIG(x) engineConfiguration->x #define ENGINE(x) engine->x -#define TRIGGER_SHAPE(x) engine->triggerCentral.triggerShape.x #endif /* GLOBAL_H_ */