refactoring

firmware/console/binary/bluetooth.cpp

@@ -1,6 +1,6 @@
 #include "global.h"
 
-#include "engine_state.h"
+#include "allsensors.h"
 #include "tunerstudio.h"
 
 #include "tunerstudio_io.h"

firmware/console/binary/tunerstudio.cpp

@@ -61,7 +61,7 @@
 
 #include "global.h"
 
-#include "engine_state.h"
+#include "allsensors.h"
 #include "tunerstudio.h"
 
 #include "main_trigger_callback.h"

firmware/console/status_loop.cpp

@@ -35,7 +35,7 @@
 #endif /* EFI_WAVE_ANALYZER */
 
 #include "trigger_central.h"
-#include "engine_state.h"
+#include "allsensors.h"
 #include "io_pins.h"
 #include "efi_gpio.h"
 #include "mmc_card.h"

firmware/controllers/algo/accel_enrichment.cpp

@@ -25,7 +25,7 @@
 #include "engine.h"
 #include "trigger_central.h"
 #include "accel_enrichment.h"
-#include "engine_state.h"
+#include "allsensors.h"
 #include "engine_math.h"
 #include "signal_executor.h"
 #if EFI_TUNER_STUDIO

firmware/controllers/algo/engine.cpp

@@ -11,7 +11,7 @@
 
 #include "global.h"
 #include "engine.h"
-#include "engine_state.h"
+#include "allsensors.h"
 #include "efi_gpio.h"
 #include "trigger_central.h"
 #include "fuel_math.h"

firmware/controllers/algo/engine.h

@@ -455,21 +455,6 @@ private:
 	void reset();
 };
 
-/**
- * 6 crossing over 50% TPS means pressing and releasing three times
- */
-#define PUMPS_TO_PRIME 6
-
-class StartupFuelPumping {
-public:
-	StartupFuelPumping();
-	void update(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-	bool isTpsAbove50;
-	int pumpsCounter;
-private:
-	void setPumpsCounter(int newValue);
-};
-
 void prepareShapes(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_SUFFIX);
 void applyNonPersistentConfiguration(Logging * logger DECLARE_ENGINE_PARAMETER_SUFFIX);

firmware/controllers/algo/engine_parts.h

@@ -162,4 +162,20 @@ public:
 #endif /* EFI_ENABLE_CRITICAL_ENGINE_STOP */
 };
 
+/**
+ * 6 crossing over 50% TPS means pressing and releasing three times
+ * TODO: looks like this code is not finished / not used?
+ */
+#define PUMPS_TO_PRIME 6
+
+class StartupFuelPumping {
+public:
+	StartupFuelPumping();
+	void update(DECLARE_ENGINE_PARAMETER_SIGNATURE);
+	bool isTpsAbove50;
+	int pumpsCounter;
+private:
+	void setPumpsCounter(int newValue);
+};
+
 #endif /* CONTROLLERS_ALGO_ENGINE_PARTS_H_ */

firmware/controllers/algo/engine_state.h

@@ -10,6 +10,5 @@
 #define ENGINE_STATE_H_
 
 #include "allsensors.h"
-#include "rpm_calculator.h"
 
 #endif /* ENGINE_STATE_H_ */

firmware/controllers/map_averaging.cpp

@@ -30,7 +30,7 @@
 #include "map_averaging.h"
 #include "trigger_central.h"
 #include "adc_inputs.h"
-#include "engine_state.h"
+#include "allsensors.h"
 #include "engine_configuration.h"
 #include "interpolation.h"
 #include "signal_executor.h"

firmware/development/wave_analyzer.cpp

@@ -16,7 +16,7 @@
 #include "eficonsole.h"
 #include "data_buffer.h"
 #include "pin_repository.h"
-#include "engine_state.h"
+#include "allsensors.h"
 #include "signal_executor.h"
 #include "engine_configuration.h"
 #include "trigger_central.h"

firmware/hw_layer/can_hw.cpp

@@ -19,7 +19,7 @@
 #include "string.h"
 #include "obd2.h"
 #include "mpu_util.h"
-#include "engine_state.h"
+#include "allsensors.h"
 #include "vehicle_speed.h"
 
 EXTERN_ENGINE