diff --git a/firmware/controllers/algo/engine_parts.h b/firmware/controllers/algo/engine_parts.h index 66b7f53829..6e8640a574 100644 --- a/firmware/controllers/algo/engine_parts.h +++ b/firmware/controllers/algo/engine_parts.h @@ -155,3 +155,10 @@ public: private: void setPumpsCounter(int newValue); }; + +struct multispark_state +{ + efitick_t delay; + efitick_t dwell; + uint8_t count; +}; diff --git a/firmware/controllers/algo/engine_state.h b/firmware/controllers/algo/engine_state.h index 8c8bfcc48d..7f9f4ed18d 100644 --- a/firmware/controllers/algo/engine_state.h +++ b/firmware/controllers/algo/engine_state.h @@ -90,5 +90,5 @@ public: MockAdcState mockAdcState; #endif /* EFI_ENABLE_MOCK_ADC */ + multispark_state multispark; }; - diff --git a/firmware/controllers/generated/engine_state_generated.h b/firmware/controllers/generated/engine_state_generated.h index 86026dffc7..bf703f1c95 100644 --- a/firmware/controllers/generated/engine_state_generated.h +++ b/firmware/controllers/generated/engine_state_generated.h @@ -248,13 +248,6 @@ struct running_fuel_s { typedef struct running_fuel_s running_fuel_s; -struct multispark_state_s -{ - efitick_t delay; - efitick_t dwell; - uint8_t count; -}; - // start of engine_state2_s struct engine_state2_s { /** @@ -431,8 +424,6 @@ struct engine_state2_s { */ angle_t cltTimingCorrection = (angle_t)0; - // TODO: generate me - multispark_state_s multispark; /** total size 164*/ }; diff --git a/firmware/integration/engine_state.txt b/firmware/integration/engine_state.txt index 91b9bfd20e..7ed9f852cc 100644 --- a/firmware/integration/engine_state.txt +++ b/firmware/integration/engine_state.txt @@ -106,13 +106,5 @@ percent_t etbFeedForward; angle_t dwellAngle;ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell angle_t cltTimingCorrection -struct multispark_state_s - efitick_t delay - efitick_t dwell - uint8_t count -end_struct - -multispark_state_s multispark - ! engine_state2_s end_struct