decoupling

firmware/console/binary/live_data.cpp

@@ -212,7 +212,7 @@ const idle_state_s* getLiveData(size_t) {
 }
 
 template<>
-const ignition_controller_s* getLiveData(size_t) {
+const ignition_state_s* getLiveData(size_t) {
 	return &engine->ignitionState;
 }
 

firmware/controllers/algo/advance_map.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "ignition_controller_generated.h"
-
 angle_t getWrappedAdvance(float rpm, float engineLoad);
 angle_t getCylinderIgnitionTrim(size_t cylinderNumber, float rpm, float ignitionLoad);
 /**
@@ -22,8 +20,3 @@ angle_t getAdvanceCorrections(float engineLoad);
 
 size_t getMultiSparkCount(float rpm);
 void initIgnitionAdvanceControl();
-
-class IgnitionState : public ignition_controller_s {
-public:
-	floatms_t getSparkDwell(float rpm);
-};

firmware/controllers/algo/engine.h

@@ -47,6 +47,7 @@
 #include "fuel_computer.h"
 #include "gear_detector.h"
 #include "advance_map.h"
+#include "ignition_state.h"
 #include "fan_control.h"
 #include "sensor_checker.h"
 #include "fuel_schedule.h"

firmware/controllers/algo/ignition/ignition_state.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include "ignition_state_generated.h"
+
+class IgnitionState : public ignition_state_s {
+public:
+	floatms_t getSparkDwell(float rpm);
+};

firmware/controllers/algo/ignition/ignition_state.txt

@@ -1,6 +1,6 @@
 ! "units",scale,offset, min,max, digits,category
 
-struct_no_prefix ignition_controller_s
+struct_no_prefix ignition_state_s
     float baseDwell;"Ignition: base dwell";"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@
 	floatms_t sparkDwell;@@GAUGE_COIL_DWELL_TIME@@;"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@
 

firmware/controllers/controllers.mk

@@ -80,6 +80,7 @@ CONTROLLERS_INC=\
 	$(CONTROLLERS_DIR)/algo/airmass \
 	$(CONTROLLERS_DIR)/algo/defaults \
 	$(CONTROLLERS_DIR)/algo/fuel \
+	$(CONTROLLERS_DIR)/algo/ignition \
 	$(CONTROLLERS_DIR)/engine_cycle \
 	$(CONTROLLERS_DIR)/trigger/decoders \
 	$(CONTROLLERS_DIR)/tcu \

firmware/controllers/engine_controller.cpp

@@ -27,8 +27,6 @@
 #include "trigger_central.h"
 #include "script_impl.h"
 #include "idle_thread.h"
-#include "hardware.h"
-#include "advance_map.h"
 #include "main_trigger_callback.h"
 #include "flash_main.h"
 #include "bench_test.h"

firmware/docs_enums.mk

@@ -6,7 +6,7 @@ DOCS_ENUMS_INPUTS = \
   $(PROJECT_DIR)/controllers/engine_cycle/prime_injection.txt \
   $(PROJECT_DIR)/controllers/trigger/trigger_central.txt \
   $(PROJECT_DIR)/controllers/trigger/trigger_state.txt \
-  $(PROJECT_DIR)/controllers/algo/ignition_controller.txt \
+  $(PROJECT_DIR)/controllers/algo/ignition/ignition_state.txt \
   $(PROJECT_DIR)/controllers/actuators/idle_state.txt \
   $(PROJECT_DIR)/controllers/actuators/electronic_throttle.txt \
   $(PROJECT_DIR)/integration/LiveData.yaml \

firmware/integration/LiveData.yaml

@@ -28,10 +28,9 @@ Usages:
     constexpr: "engine->fuelComputer"
     conditional_compilation: "EFI_ENGINE_CONTROL"
 
-  - name: ignition_controller
-    cppFileName: advance_map
+  - name: ignition_state
+    folder: controllers/algo/ignition
     java: IgnitionState.java
-    folder: controllers/algo
     prepend: integration/rusefi_config_shared.txt
     constexpr: "engine->ignitionState"
 

firmware/live_data_generated/ignition_state_generated.h

@@ -1,10 +1,10 @@
-// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_controller.txt
+// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition/ignition_state.txt
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
 #include "rusefi_types.h"
 // start of ignition_controller_s
-struct ignition_controller_s {
+struct ignition_state_s {
 	/**
 	 * "Ignition: base dwell"
 	 * units: ms
@@ -189,7 +189,7 @@ struct ignition_controller_s {
 	offset 40 bit 31 */
 	bool unusedBit_15_31 : 1 {};
 };
-static_assert(sizeof(ignition_controller_s) == 44);
+static_assert(sizeof(ignition_state_s) == 44);
 
 // end
-// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_controller.txt
+// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition/ignition_state.txt