diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index cb9dc61f2f..30536ba344 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -435,7 +435,7 @@ static const LogField fields[] = { {engine->engineState.egtValue2, "egtValue2", "", 0}, {engine->engineState.desiredRpmLimit, "User-defined RPM hard limit", "rpm", 0}, {engine->engineState.fuelInjectionCounter, "Fuel: Injection counter", "", 0}, - {engine->engineState.sparkCounter, "Ign: Spark counter", "", 0}, + {engine->engineState.globalSparkCounter, "Ign: Spark counter", "", 0}, {engine->engineState.fuelingLoad, "Fuel: Load", "", 0}, {engine->engineState.ignitionLoad, "Ignition: load", "", 0}, {engine->engineState.veTableYAxis, "veTableYAxis", "%", 0}, diff --git a/firmware/controllers/algo/engine_state.txt b/firmware/controllers/algo/engine_state.txt index f69432b443..bd72d3af20 100644 --- a/firmware/controllers/algo/engine_state.txt +++ b/firmware/controllers/algo/engine_state.txt @@ -58,7 +58,7 @@ struct_no_prefix engine_state_s int16_t desiredRpmLimit;User-defined RPM hard limit;"rpm", 1, 0, 0, 30000, 0 uint32_t fuelInjectionCounter;Fuel: Injection counter - uint32_t sparkCounter;Ign: Spark counter + uint32_t globalSparkCounter;Ign: Spark counter ! Values used for load axes for fuel/ign tables ! These may or may not be the same value, depending on mode diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index 71da9dc1d5..11707d7c42 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -360,7 +360,7 @@ struct engine_state_s { * Ign: Spark counter * offset 76 */ - uint32_t sparkCounter = (uint32_t)0; + uint32_t globalSparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ * offset 80 diff --git a/firmware/controllers/algo/event_registry.h b/firmware/controllers/algo/event_registry.h index 6049d2eab2..3236d03fc3 100644 --- a/firmware/controllers/algo/event_registry.h +++ b/firmware/controllers/algo/event_registry.h @@ -69,7 +69,7 @@ public: /** * Sequential number of currently processed spark event - * @see engineState.sparkCounter + * @see engineState.globalSparkCounter */ int sparkId = 0; /** diff --git a/firmware/controllers/engine_cycle/spark_logic.cpp b/firmware/controllers/engine_cycle/spark_logic.cpp index a2d939290f..3c4468418c 100644 --- a/firmware/controllers/engine_cycle/spark_logic.cpp +++ b/firmware/controllers/engine_cycle/spark_logic.cpp @@ -342,7 +342,7 @@ static void scheduleSparkEvent(bool limitedSpark, IgnitionEvent *event, /** * By the way 32-bit value should hold at least 400 hours of events at 6K RPM x 12 events per revolution */ - event->sparkId = engine->engineState.sparkCounter++; + event->sparkId = engine->engineState.globalSparkCounter++; event->wasSparkLimited = limitedSpark; efitick_t chargeTime = 0; @@ -494,7 +494,7 @@ void onTriggerEventSparkLogic(int rpm, efitick_t edgeTimestamp, float currentPha // artificial misfire on cylinder #1 for testing purposes // enable artificialMisfire // set_fsio_setting 6 20 - warning(ObdCode::CUSTOM_ARTIFICIAL_MISFIRE, "artificial misfire on cylinder #1 for testing purposes %d", engine->engineState.sparkCounter); + warning(ObdCode::CUSTOM_ARTIFICIAL_MISFIRE, "artificial misfire on cylinder #1 for testing purposes %d", engine->engineState.globalSparkCounter); continue; } #if EFI_LAUNCH_CONTROL diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 1802a983d2..bfaabd80cd 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1210,9 +1210,9 @@ float getOutputValueByName(const char *name) { // fuelInjectionCounter case -1839290700: return engine->engineState.fuelInjectionCounter; -// sparkCounter +// globalSparkCounter case -1515591290: - return engine->engineState.sparkCounter; + return engine->engineState.globalSparkCounter; // fuelingLoad case 583799407: return engine->engineState.fuelingLoad;