From 1768b68e29abed28681313e7d614fc7b85ea6bca Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 18 Nov 2014 13:03:28 -0600 Subject: [PATCH] auto-sync --- firmware/controllers/core/logic_expression.cpp | 6 ++++++ firmware/controllers/engine_controller.cpp | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/core/logic_expression.cpp b/firmware/controllers/core/logic_expression.cpp index fabfc6beb0..06fdf384db 100644 --- a/firmware/controllers/core/logic_expression.cpp +++ b/firmware/controllers/core/logic_expression.cpp @@ -33,6 +33,12 @@ static LENameOrdinalPair leMoreOrEqual(LE_OPERATOR_MORE_OR_EQUAL, ">="); static LENameOrdinalPair leLess(LE_OPERATOR_LESS, "<"); static LENameOrdinalPair leLessOrEquals(LE_OPERATOR_LESS_OR_EQUAL, "<="); +#define LE_EVAL_POOL_SIZE 32 + +static LECalculator evalCalc; +static LEElement evalPoolElements[LE_EVAL_POOL_SIZE]; +static LEElementPool evalPool(evalPoolElements, LE_EVAL_POOL_SIZE); + LENameOrdinalPair::LENameOrdinalPair(le_action_e action, const char *name) { this->action = action; this->name = name; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 6d8dec7d52..e3c2520ab7 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -55,15 +55,14 @@ #include "logic_expression.h" #include "le_functions.h" -LECalculator calc; - #define LE_ELEMENT_POOL_SIZE 256 +static LECalculator calc; static LEElement mainPool[LE_ELEMENT_POOL_SIZE]; -LEElementPool lePool(mainPool, LE_ELEMENT_POOL_SIZE); +static LEElementPool lePool(mainPool, LE_ELEMENT_POOL_SIZE); -LEElement * fuelPumpLogic; -LEElement * radiatorFanLogic; +static LEElement * fuelPumpLogic; +static LEElement * radiatorFanLogic; persistent_config_container_s persistentState CCM_OPTIONAL ;