From f1867644a6e1962c4795872b5ddbef0261e13d04 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 25 Nov 2014 18:04:39 -0600 Subject: [PATCH] auto-sync --- firmware/controllers/algo/engine.h | 4 ++++ firmware/controllers/math/engine_math.cpp | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index e57c44f5a0..560ff65a5c 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -71,10 +71,14 @@ public: uint32_t time2; uint32_t time3; uint32_t time4; + uint32_t time5; + uint32_t time6; uint32_t before2; uint32_t before3; uint32_t before4; + uint32_t before5; + uint32_t before6; diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index b40087f2ef..28c5714c03 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -93,9 +93,8 @@ OutputSignalList injectonSignals CCM_OPTIONAL; static void registerSparkEvent(IgnitionEventList *list, io_pin_e pin, float localAdvance, float dwell DECLARE_ENGINE_PARAMETER_S) { - IgnitionEvent *event = list->getNextActuatorEvent(); - if (event == NULL) - return; // error already reported + // todo efiAssertVoid(list->size) + IgnitionEvent *event = &list->events[list->size++]; if (!isPinAssigned(pin)) { // todo: extact method for this index math