auto-sync

firmware/controllers/algo/OutputSignalArray.cpp

@@ -1,48 +0,0 @@
-/**
- * @file OutputSignalArray.cpp
- *
- * @date Mar 20, 2014
- * @author Andrey Belomutskiy, (c) 2012-2014
- *
- * This file is part of rusEfi - see http://rusefi.com
- *
- * rusEfi is free software; you can redistribute it and/or modify it under the terms of
- * the GNU General Public License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * rusEfi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "OutputSignalList.h"
-
-OutputSignalList::OutputSignalList() {
-	clear();
-}
-
-void OutputSignalList::clear() {
-	size = 0;
-}
-
-int OutputSignalList::getSize() {
-	return size;
-}
-
-
-OutputSignal * OutputSignalList::add(io_pin_e ioPin) {
-	if (size == OUTPUT_SIGNAL_MAX_SIZE) {
-		firmwareError("Too many signals, adding %d", ioPin);
-		return NULL;
-	}
-
-	OutputSignal *signal = &signals[size++];
-
-	initOutputSignal(signal, ioPin);
-
-	return signal;
-}
-

firmware/controllers/algo/OutputSignalList.h

@@ -1,44 +0,0 @@
-/*
- * @file OutputSignalList.h
- *
- * @date Mar 20, 2014
- * @author Andrey Belomutskiy, (c) 2012-2014
- *
- * This file is part of rusEfi - see http://rusefi.com
- *
- * rusEfi is free software; you can redistribute it and/or modify it under the terms of
- * the GNU General Public License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * rusEfi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef OUTPUTSIGNALLIST_H_
-#define OUTPUTSIGNALLIST_H_
-
-#include "signal_executor.h"
-#include "io_pins.h"
-
-// todo: this value is too low for 6 cyl engine, get it back to 60
-#define OUTPUT_SIGNAL_MAX_SIZE 90
-
-class OutputSignalList {
-public:
-	OutputSignalList();
-	void clear();
-	OutputSignal * add(io_pin_e ioPin);
-	int getSize();
-
-private:
-	int size;
-	OutputSignal signals[OUTPUT_SIGNAL_MAX_SIZE];
-
-};
-
-
-#endif /* OUTPUTSIGNALLIST_H_ */

firmware/controllers/algo/algo.mk

@@ -3,8 +3,7 @@ CONTROLLERS_ALGO_SRC = $(PROJECT_DIR)/controllers/algo/map_adjuster.c \
 	$(PROJECT_DIR)/controllers/algo/malfunction_central.c \
 	$(PROJECT_DIR)/controllers/algo/nmea.c
 	
-CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/OutputSignalArray.cpp \
-	$(PROJECT_DIR)/controllers/algo/advance_map.cpp \
+CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
 	$(PROJECT_DIR)/controllers/algo/idle_controller.cpp \
 	$(PROJECT_DIR)/controllers/algo/auto_generated_enums.cpp \
 	$(PROJECT_DIR)/controllers/algo/fuel_math.cpp \
@@ -14,5 +13,4 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/OutputSignalArray.cpp
 	$(PROJECT_DIR)/controllers/algo/event_registry.cpp \
 	$(PROJECT_DIR)/controllers/algo/algo.cpp \
 	$(PROJECT_DIR)/controllers/algo/signal_executor.cpp \
-	$(PROJECT_DIR)/controllers/algo/enum_strings.cpp
-	
+	$(PROJECT_DIR)/controllers/algo/enum_strings.cpp	

firmware/controllers/algo/engine_configuration.cpp

@@ -559,7 +559,6 @@ static void setCustomEngineConfiguration(engine_configuration_s *engineConfigura
 
 void resetConfigurationExt(Logging * logger, engine_type_e engineType, Engine *engine) {
 	engine_configuration_s *engineConfiguration = engine->engineConfiguration;
-	engine_configuration2_s *engineConfiguration2 = engine->engineConfiguration2;
 	board_configuration_s *boardConfiguration = &engineConfiguration->bc;
 	/**
 	 * Let's apply global defaults first
@@ -677,7 +676,6 @@ engine_configuration2_s::engine_configuration2_s() {
 
 void applyNonPersistentConfiguration(Logging * logger, Engine *engine) {
 	engine_configuration_s *engineConfiguration = engine->engineConfiguration;
-	engine_configuration2_s *engineConfiguration2 = engine->engineConfiguration2;
 // todo: this would require 'initThermistors() to re-establish a reference, todo: fix
 //	memset(engineConfiguration2, 0, sizeof(engine_configuration2_s));
 #if EFI_PROD_CODE

firmware/controllers/algo/event_registry.h

@@ -10,6 +10,7 @@
 
 #include "global.h"
 #include "signal_executor.h"
+#include "fl_stack.h"
 
 #define MAX_EVENT_COUNT 80
 
@@ -51,38 +52,8 @@ struct IgnitionEvent_struct {
 	char *name;
 };
 
-template <class Type, int Dimention>
-class ArrayList {
-public:
-	int size;
-	Type events[Dimention];
-	void resetEventList(void);
-	Type *getNextActuatorEvent(void);
-};
-
-template <class Type, int Dimention>
-void ArrayList< Type, Dimention>::resetEventList(void) {
-	size = 0;
-}
-
-template <class Type, int Dimention>
-Type * ArrayList< Type, Dimention>::getNextActuatorEvent(void) {
-	efiAssert(size < Dimention, "registerActuatorEvent() too many events", (Type *)NULL);
-	return &events[size++];
-}
-
 typedef ArrayList<InjectionEvent, MAX_EVENT_COUNT> ActuatorEventList;
 
 typedef ArrayList<IgnitionEvent, MAX_EVENT_COUNT> IgnitionEventList;
 
-///**
-// * this is an intermediate implementation of flexible event handling.
-// *
-// * In the future implementation we will drop the 'eventIndex' parameter and everything will be
-// * angle-driven. But that's just a plan for next iteration.
-// *
-// * @param	actuator injector or coil OutputSignal
-// */
-//void registerActuatorEvent(ActuatorEventList *list, int eventIndex, OutputSignal *actuator, float angleOffset);
-
 #endif /* EVENT_REGISTRY_H_ */

firmware/controllers/algo/fuel_math.cpp

@@ -43,6 +43,8 @@
 
 EXTERN_ENGINE;
 
+static Map3D1616 fuelMap;
+
 float getBaseFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
 	if (engine->engineConfiguration->algorithm == LM_SPEED_DENSITY) {
 		return getSpeedDensityFuel(engine, rpm);
@@ -98,8 +100,6 @@ float getRunningFuel(float baseFuelMs, int rpm DECLARE_ENGINE_PARAMETER_S) {
 	return baseFuelMs * cltCorrection * iatCorrection;
 }
 
-static Map3D1616 fuelMap;
-
 /**
  * @brief	Injector lag correction
  * @param	vBatt	Battery voltage.

firmware/controllers/algo/map_adjuster.c

@@ -41,10 +41,6 @@ void initMapAdjuster(void) {
 	avgFill(&adjustments, 1, 1);
 }
 
-float maxF(float i1, float i2) {
-	return i1 > i2 ? i1 : i2;
-}
-
 static int adjustCell(int i, int j, void (*callback)(int, float, float)) {
 	int count = afrs.counts[i][j];
 	if (count < HOW_MANY_MEASURMENTS_ARE_NEEDED)

firmware/controllers/core/core.mk

@@ -1,7 +1,6 @@
 
-CONTROLLERS_CORE_SRC = $(PROJECT_DIR)/controllers/core/avg_values.c
-
 CONTROLLERS_CORE_SRC_CPP = $(PROJECT_DIR)/controllers/core/EfiWave.cpp \
+	$(PROJECT_DIR)/controllers/core/avg_values.cpp \
 	$(PROJECT_DIR)/controllers/core/table_helper.cpp \
 	$(PROJECT_DIR)/controllers/core/fsio_core.cpp \
 	$(PROJECT_DIR)/controllers/core/interpolation.cpp \

firmware/controllers/core/fl_stack.h

@@ -64,4 +64,24 @@ int FLStack<T, MAXSIZE>::size() {
 	return index;
 }
 
+template <class Type, int Dimention>
+class ArrayList {
+public:
+	int size;
+	Type elements[Dimention];
+	void reset(void);
+	Type *add(void);
+};
+
+template <class Type, int Dimention>
+void ArrayList< Type, Dimention>::reset(void) {
+	size = 0;
+}
+
+template <class Type, int Dimention>
+Type * ArrayList< Type, Dimention>::add(void) {
+	efiAssert(size < Dimention, "add() too many elements", (Type *)NULL);
+	return &elements[size++];
+}
+
 #endif /* FL_STACK_H_ */

firmware/controllers/engine_controller.cpp

@@ -383,7 +383,7 @@ void initEngineContoller(Engine *engine) {
 		/**
 		 * This method initialized the main listener which actually runs injectors & ignition
 		 */
-		initMainEventListener(engine, engineConfiguration2);
+		initMainEventListener(engine);
 	}
 #endif /* EFI_ENGINE_CONTROL */
 

firmware/controllers/flash_main.cpp

@@ -32,8 +32,6 @@ extern persistent_config_container_s persistentState;
 
 extern engine_configuration_s *engineConfiguration;
 
-extern engine_configuration2_s * engineConfiguration2;
-
 #define FLASH_ADDR 0x08060000
 
 #define PERSISTENT_SIZE sizeof(persistent_config_container_s)

firmware/controllers/math/engine_math.cpp

@@ -25,7 +25,6 @@
 #include "interpolation.h"
 #include "allsensors.h"
 #include "io_pins.h"
-#include "OutputSignalList.h"
 #include "trigger_decoder.h"
 #include "event_registry.h"
 #include "efiGpio.h"
@@ -101,14 +100,13 @@ void initializeIgnitionActions(float advance, float dwellAngle, IgnitionEventLis
 
 	efiAssertVoid(engineConfiguration->cylindersCount > 0, "cylindersCount");
 
-	list->resetEventList();
+	list->reset();
 
 	for (int i = 0; i < CONFIG(cylindersCount); i++) {
 		float localAdvance = advance + ENGINE(angleExtra[i]);
 		io_pin_e pin = ENGINE(ignitionPin[i]);
 
-		// todo efiAssertVoid(list->size)
-		IgnitionEvent *event = &list->events[list->size++];
+		IgnitionEvent *event = list->add();
 
 		if (!isPinAssigned(pin)) {
 			// todo: extact method for this index math
@@ -129,8 +127,10 @@ void FuelSchedule::registerInjectionEvent(io_pin_e pin, float angle, bool_t isSi
 		warning(OBD_PCM_Processor_Fault, "no_pin_inj #%d", (int) pin - (int) INJECTOR_1_OUTPUT + 1);
 	}
 
-	InjectionEvent *ev = list->getNextActuatorEvent();
-	OutputSignal *actuator = injectonSignals.add(pin);
+	InjectionEvent *ev = list->add();
+	OutputSignal *actuator = injectonSignals.add();
+	initOutputSignal(actuator, pin);
+
 
 	ev->isSimultanious = isSimultanious;
 
@@ -157,7 +157,7 @@ void FuelSchedule::clear() {
 void FuelSchedule::addFuelEvents(injection_mode_e mode DECLARE_ENGINE_PARAMETER_S) {
 	ActuatorEventList *list = &events;
 	;
-	list->resetEventList();
+	list->reset();
 
 	float baseAngle = engineConfiguration->globalTriggerAngleOffset + engineConfiguration->injectionOffset;
 
@@ -342,7 +342,7 @@ void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_F) {
 		triggerIndexByAngle[angle] = findAngleIndex(angle PASS_ENGINE_PARAMETER);
 	}
 
-	injectonSignals.clear();
+	injectonSignals.reset();
 	engineConfiguration2->crankingInjectionEvents.addFuelEvents(
 			engineConfiguration->crankingInjectionMode PASS_ENGINE_PARAMETER);
 	engineConfiguration2->injectionEvents.addFuelEvents(engineConfiguration->injectionMode PASS_ENGINE_PARAMETER);

firmware/controllers/math/engine_math.h

@@ -15,6 +15,11 @@
 #include "table_helper.h"
 #include "engine.h"
 
+// todo: this value is too low for 6 cyl engine, get it back to 60
+#define OUTPUT_SIGNAL_MAX_SIZE 90
+
+typedef ArrayList<OutputSignal, OUTPUT_SIGNAL_MAX_SIZE> OutputSignalList;
+
 #define INJECTOR_PIN_BY_INDEX(index) (io_pin_e) ((int) INJECTOR_1_OUTPUT + (index))
 
 void findTriggerPosition(

firmware/controllers/settings.cpp

@@ -65,7 +65,8 @@ void printSpiState(Logging *logger, board_configuration_s *boardConfiguration) {
 
 extern board_configuration_s *boardConfiguration;
 
-static void printOutputs(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2) {
+static void printOutputs(engine_configuration_s *engineConfiguration) {
+	// engine_configuration2_s *engineConfiguration2
 	scheduleMsg(&logger, "injectionPins: mode %s", pinModeToString(boardConfiguration->injectionPinMode));
 	for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
 		brain_pin_e brainPin = boardConfiguration->injectionPins[i];
@@ -93,7 +94,7 @@ static void printOutputs(engine_configuration_s *engineConfiguration, engine_con
 /**
  * @brief	Prints current engine configuration to human-readable console.
  */
-void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2) {
+void printConfiguration(engine_configuration_s *engineConfiguration) {
 
 	scheduleMsg(&logger, "Template %s/%d trigger %s/%s", getConfigurationName(engineConfiguration->engineType),
 			engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->triggerConfig.triggerType),
@@ -162,7 +163,7 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
 
 	scheduleMsg(&logger, "analogInputDividerCoefficient: %f", engineConfiguration->analogInputDividerCoefficient);
 
-	printOutputs(engineConfiguration, engineConfiguration2);
+	printOutputs(engineConfiguration);
 
 	scheduleMsg(&logger, "boardTestModeJumperPin: %s/nesting=%d", hwPortname(boardConfiguration->boardTestModeJumperPin),
 			maxNesting);
@@ -184,7 +185,7 @@ extern engine_configuration_s *engineConfiguration;
 extern engine_configuration2_s *engineConfiguration2;
 
 static void doPrintConfiguration(Engine *engine) {
-	printConfiguration(engineConfiguration, engine->engineConfiguration2);
+	printConfiguration(engineConfiguration);
 }
 
 EXTERN_ENGINE;

firmware/controllers/settings.h

@@ -13,7 +13,7 @@
 
 void initSettings(engine_configuration_s *engineConfiguration);
 void printSpiState(Logging *logger, board_configuration_s *boardConfiguration);
-void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2);
+void printConfiguration(engine_configuration_s *engineConfiguration);
 
 #ifdef __cplusplus
 extern "C"

firmware/controllers/trigger/main_trigger_callback.cpp

@@ -170,7 +170,7 @@ static ALWAYS_INLINE void handleFuel(uint32_t eventIndex, int rpm DECLARE_ENGINE
 		return;
 
 	for (int i = 0; i < source->size; i++) {
-		InjectionEvent *event = &source->events[i];
+		InjectionEvent *event = &source->elements[i];
 		if (event->position.eventIndex != eventIndex)
 			continue;
 		handleFuelInjectionEvent(event, rpm PASS_ENGINE_PARAMETER);
@@ -267,7 +267,7 @@ static ALWAYS_INLINE void handleSpark(uint32_t eventIndex, int rpm,
 
 //	scheduleSimpleMsg(&logger, "eventId spark ", eventIndex);
 	for (int i = 0; i < list->size; i++) {
-		IgnitionEvent *event = &list->events[i];
+		IgnitionEvent *event = &list->elements[i];
 		if (event->dwellPosition.eventIndex != eventIndex)
 			continue;
 		handleSparkEvent(eventIndex, event, rpm PASS_ENGINE_PARAMETER);
@@ -402,7 +402,7 @@ static void showTriggerHistogram(void) {
 #endif
 }
 
-void MainTriggerCallback::init(Engine *engine, engine_configuration2_s *engineConfiguration2) {
+void MainTriggerCallback::init(Engine *engine) {
 	efiAssertVoid(engine!=NULL, "engine NULL");
 	this->engine = engine;
 }
@@ -417,10 +417,10 @@ static void showMainInfo(Engine *engine) {
 #endif
 }
 
-void initMainEventListener(Engine *engine, engine_configuration2_s *engineConfiguration2) {
+void initMainEventListener(Engine *engine) {
 	efiAssertVoid(engine!=NULL, "null engine");
 
-	mainTriggerCallbackInstance.init(engine, engineConfiguration2);
+	mainTriggerCallbackInstance.init(engine);
 
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 	addConsoleAction("performanceinfo", showTriggerHistogram);

firmware/controllers/trigger/main_trigger_callback.h

@@ -23,12 +23,12 @@
 
 class MainTriggerCallback {
 public:
-	void init(Engine *engine, engine_configuration2_s *engineConfiguration2);
+	void init(Engine *engine);
 
 	Engine *engine;
 
 };
-void initMainEventListener(Engine *engine, engine_configuration2_s *engineConfiguration2);
+void initMainEventListener(Engine *engine);
 void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECLARE_ENGINE_PARAMETER_S);
 #endif
 

firmware/controllers/trigger/rpm_calculator.cpp

@@ -65,7 +65,6 @@ RpmCalculator::RpmCalculator() {
  * @return true if there was a full shaft revolution within the last second
  */
 bool RpmCalculator::isRunning(DECLARE_ENGINE_PARAMETER_F) {
-	engine_configuration2_s *engineConfiguration2 = engine->engineConfiguration2;
 	uint64_t nowNt = getTimeNowNt();
 	if (engine->stopEngineRequestTimeNt != 0) {
 		if (nowNt - lastRpmEventTimeNt < 3 * US2NT(US_PER_SECOND_LL)) {

firmware/controllers/trigger/trigger_central.cpp

@@ -205,12 +205,7 @@ void printAllCallbacksHistogram(void) {
 #endif
 }
 
-#if EFI_PROD_CODE || EFI_SIMULATOR
-// todo: eliminate this extern which is needed by 'triggerInfo'
-extern engine_configuration_s *engineConfiguration;
-extern engine_configuration2_s * engineConfiguration2;
-extern board_configuration_s *boardConfiguration;
-#endif
+EXTERN_ENGINE;
 
 static void triggerShapeInfo(Engine *engine) {
 #if EFI_PROD_CODE || EFI_SIMULATOR

firmware/controllers/trigger/trigger_emulator_algo.cpp

@@ -47,8 +47,7 @@ void TriggerEmulatorHelper::handleEmulatorCallback(PwmConfig *state, int stateIn
 	//	print("hello %d\r\n", chTimeNow());
 }
 
-extern engine_configuration_s *engineConfiguration;
-extern engine_configuration2_s *engineConfiguration2;
+EXTERN_ENGINE;
 
 /*
  * todo: should we simply re-use instances used by trigger_decoder?

unit_tests/test_data_structures/test_event_registry.cpp

@@ -8,7 +8,6 @@
 #include "event_registry.h"
 #include "test_event_registry.h"
 #include "main.h"
-#include "OutputSignalList.h"
 
 static ActuatorEventList eventList;
 static ActuatorEventList result;

unit_tests/test_fuel_map.cpp

@@ -12,7 +12,6 @@
 #include "trigger_structure.h"
 #include "allsensors.h"
 #include "engine_math.h"
-#include "OutputSignalList.h"
 #include "ec2.h"
 #include "trigger_decoder.h"
 #include "engine_test_helper.h"
@@ -177,18 +176,18 @@ void testAngleResolver(void) {
 
 	OutputSignalList list;
 
-	ae.resetEventList();
+	ae.reset();
 	printf("*************************************************** testAngleResolver 0\r\n");
-	findTriggerPosition(&ae.getNextActuatorEvent()->position, 53 - 175 PASS_ENGINE_PARAMETER);
+	findTriggerPosition(&ae.add()->position, 53 - 175 PASS_ENGINE_PARAMETER);
 	assertEqualsM("size", 1, ae.size);
-	assertEquals(1, ae.events[0].position.eventIndex);
-	assertEquals(3.1588, ae.events[0].position.angleOffset);
+	assertEquals(1, ae.elements[0].position.eventIndex);
+	assertEquals(3.1588, ae.elements[0].position.angleOffset);
 
 	printf("*************************************************** testAngleResolver 2\r\n");
-	ae.resetEventList();
-	findTriggerPosition(&ae.getNextActuatorEvent()->position, 51 + 180 - 175 PASS_ENGINE_PARAMETER);
-	assertEquals(2, ae.events[0].position.eventIndex);
-	assertEquals(112.3495, ae.events[0].position.angleOffset);
+	ae.reset();
+	findTriggerPosition(&ae.add()->position, 51 + 180 - 175 PASS_ENGINE_PARAMETER);
+	assertEquals(2, ae.elements[0].position.eventIndex);
+	assertEquals(112.3495, ae.elements[0].position.angleOffset);
 }
 
 void testPinHelper(void) {

unit_tests/test_trigger_decoder.cpp

@@ -138,11 +138,11 @@ static void test1995FordInline6TriggerDecoder(void) {
 
 	IgnitionEventList *ecl = &eth.ec2.ignitionEvents[0];
 	assertEqualsM("ignition events size", 6, ecl->size);
-	assertEqualsM("event index", 0, ecl->events[0].dwellPosition.eventIndex);
-	assertEquals(0, ecl->events[0].dwellPosition.angleOffset);
+	assertEqualsM("event index", 0, ecl->elements[0].dwellPosition.eventIndex);
+	assertEquals(0, ecl->elements[0].dwellPosition.angleOffset);
 
-	assertEqualsM("event index", 10, ecl->events[5].dwellPosition.eventIndex);
-	assertEquals(0, ecl->events[5].dwellPosition.angleOffset);
+	assertEqualsM("event index", 10, ecl->elements[5].dwellPosition.eventIndex);
+	assertEquals(0, ecl->elements[5].dwellPosition.angleOffset);
 
 	TriggerState state;
 
@@ -418,7 +418,7 @@ static void testRpmCalculator(void) {
 	assertEqualsM("index #1", 15, eth.triggerCentral.triggerState.getCurrentIndex());
 
 	static MainTriggerCallback triggerCallbackInstance;
-	triggerCallbackInstance.init(&eth.engine, ec2);
+	triggerCallbackInstance.init(&eth.engine);
 	eth.triggerCentral.addEventListener(mainTriggerCallback, "main loop", &eth.engine);
 
 //	engine.rpmCalculator = &eth.rpmState;

win32_functional_tests/simulator/rusEfiFunctionalTest.cpp

@@ -87,7 +87,7 @@ void rusEfiFunctionalTest(void) {
 
 	initTriggerEmulator(engine);
 
-	initMainEventListener(engine, engineConfiguration2);
+	initMainEventListener(engine);
 
 	initTriggerCentral(engine);