only: renaming variable

This commit is contained in:
Andrey 2024-02-29 00:29:48 -05:00
parent 50b2fccb3b
commit 28cdf85ddc
6 changed files with 8 additions and 8 deletions

View File

@ -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},

View File

@ -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

View File

@ -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

View File

@ -69,7 +69,7 @@ public:
/**
* Sequential number of currently processed spark event
* @see engineState.sparkCounter
* @see engineState.globalSparkCounter
*/
int sparkId = 0;
/**

View File

@ -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

View File

@ -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;