rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only: last rename for now

This commit is contained in:
Andrey 2024-02-29 00:41:12 -05:00
parent a58ab9ebcf
commit d2b6ae4d11
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/event_registry.h
View File

@ -76,7 +76,7 @@ public:
* [0, cylindersCount) * [0, cylindersCount)
*/ */
int cylinderIndex = 0; int cylinderIndex = 0;
int8_t cylinderNumber = 0; int8_t coilIndex = 0;
char *name = nullptr; char *name = nullptr;
IgnitionOutputPin *getOutputForLoggins(); IgnitionOutputPin *getOutputForLoggins();
}; };

12
firmware/controllers/engine_cycle/spark_logic.cpp
View File

@ -85,7 +85,7 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
// let's save planned duration so that we can later compare it with reality // let's save planned duration so that we can later compare it with reality
event->sparkDwell = sparkDwell; event->sparkDwell = sparkDwell;
angle_t finalIgnitionTiming = getEngineState()->timingAdvance[event->cylinderNumber]; angle_t finalIgnitionTiming = getEngineState()->timingAdvance[event->coilIndex];
// 10 ATDC ends up as 710, convert it to -10 so we can log and clamp correctly // 10 ATDC ends up as 710, convert it to -10 so we can log and clamp correctly
if (finalIgnitionTiming > 360) { if (finalIgnitionTiming > 360) {
@ -107,7 +107,7 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
// Negate because timing *before* TDC, and we schedule *after* TDC // Negate because timing *before* TDC, and we schedule *after* TDC
- finalIgnitionTiming - finalIgnitionTiming
// Offset by this cylinder's position in the cycle // Offset by this cylinder's position in the cycle
+ getPerCylinderFiringOrderOffset(event->cylinderIndex, event->cylinderNumber); + getPerCylinderFiringOrderOffset(event->cylinderIndex, event->coilIndex);
efiAssertVoid(ObdCode::CUSTOM_SPARK_ANGLE_1, !cisnan(sparkAngle), "sparkAngle#1"); efiAssertVoid(ObdCode::CUSTOM_SPARK_ANGLE_1, !cisnan(sparkAngle), "sparkAngle#1");
wrapAngle(sparkAngle, "findAngle#2", ObdCode::CUSTOM_ERR_6550); wrapAngle(sparkAngle, "findAngle#2", ObdCode::CUSTOM_ERR_6550);
@ -141,7 +141,7 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
// Stash which cylinder we're scheduling so that knock sensing knows which // Stash which cylinder we're scheduling so that knock sensing knows which
// cylinder just fired // cylinder just fired
event->cylinderNumber = coilIndex; event->coilIndex = coilIndex;
angle_t dwellStartAngle = sparkAngle - dwellAngleDuration; angle_t dwellStartAngle = sparkAngle - dwellAngleDuration;
efiAssertVoid(ObdCode::CUSTOM_ERR_6590, !cisnan(dwellStartAngle), "findAngle#5"); efiAssertVoid(ObdCode::CUSTOM_ERR_6590, !cisnan(dwellStartAngle), "findAngle#5");
@ -253,7 +253,7 @@ if (engineConfiguration->debugMode == DBG_DWELL_METRIC) {
// Trailing sparks are enabled - schedule an event for the corresponding trailing coil // Trailing sparks are enabled - schedule an event for the corresponding trailing coil
scheduleByAngle( scheduleByAngle(
&event->trailingSparkFire, nowNt, engine->engineState.trailingSparkAngle, &event->trailingSparkFire, nowNt, engine->engineState.trailingSparkAngle,
{ &fireTrailingSpark, &enginePins.trailingCoils[event->cylinderNumber] } { &fireTrailingSpark, &enginePins.trailingCoils[event->coilIndex] }
); );
} }
@ -261,7 +261,7 @@ if (engineConfiguration->debugMode == DBG_DWELL_METRIC) {
prepareCylinderIgnitionSchedule(dwellAngleDuration, sparkDwell, event); prepareCylinderIgnitionSchedule(dwellAngleDuration, sparkDwell, event);
} }
engine->onSparkFireKnockSense(event->cylinderNumber, nowNt); engine->onSparkFireKnockSense(event->coilIndex, nowNt);
} }
static void startDwellByTurningSparkPinHigh(IgnitionEvent *event, IgnitionOutputPin *output) { static void startDwellByTurningSparkPinHigh(IgnitionEvent *event, IgnitionOutputPin *output) {
@ -311,7 +311,7 @@ void turnSparkPinHigh(IgnitionEvent *event) {
} }
if (engineConfiguration->enableTrailingSparks) { if (engineConfiguration->enableTrailingSparks) {
IgnitionOutputPin *output = &enginePins.trailingCoils[event->cylinderNumber]; IgnitionOutputPin *output = &enginePins.trailingCoils[event->coilIndex];
// Trailing sparks are enabled - schedule an event for the corresponding trailing coil // Trailing sparks are enabled - schedule an event for the corresponding trailing coil
scheduleByAngle( scheduleByAngle(
&event->trailingSparkCharge, nowNt, engine->engineState.trailingSparkAngle, &event->trailingSparkCharge, nowNt, engine->engineState.trailingSparkAngle,

24
unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp
View File

@ -18,18 +18,18 @@ TEST(ignition, twoCoils) {
initializeIgnitionActions(); initializeIgnitionActions();
// first one to fire uses first coil // first one to fire uses first coil
EXPECT_EQ(engine->ignitionEvents.elements[0].cylinderNumber, 0); EXPECT_EQ(engine->ignitionEvents.elements[0].coilIndex, 0);
EXPECT_EQ(engine->ignitionEvents.elements[1].cylinderNumber, 6); EXPECT_EQ(engine->ignitionEvents.elements[1].coilIndex, 6);
EXPECT_EQ(engine->ignitionEvents.elements[2].cylinderNumber, 0); EXPECT_EQ(engine->ignitionEvents.elements[2].coilIndex, 0);
EXPECT_EQ(engine->ignitionEvents.elements[3].cylinderNumber, 6); EXPECT_EQ(engine->ignitionEvents.elements[3].coilIndex, 6);
EXPECT_EQ(engine->ignitionEvents.elements[4].cylinderNumber, 0); EXPECT_EQ(engine->ignitionEvents.elements[4].coilIndex, 0);
EXPECT_EQ(engine->ignitionEvents.elements[5].cylinderNumber, 6); EXPECT_EQ(engine->ignitionEvents.elements[5].coilIndex, 6);
EXPECT_EQ(engine->ignitionEvents.elements[6].cylinderNumber, 0); EXPECT_EQ(engine->ignitionEvents.elements[6].coilIndex, 0);
EXPECT_EQ(engine->ignitionEvents.elements[7].cylinderNumber, 6); EXPECT_EQ(engine->ignitionEvents.elements[7].coilIndex, 6);
EXPECT_EQ(engine->ignitionEvents.elements[8].cylinderNumber, 0); EXPECT_EQ(engine->ignitionEvents.elements[8].coilIndex, 0);
EXPECT_EQ(engine->ignitionEvents.elements[9].cylinderNumber, 6); EXPECT_EQ(engine->ignitionEvents.elements[9].coilIndex, 6);
EXPECT_EQ(engine->ignitionEvents.elements[10].cylinderNumber, 0); EXPECT_EQ(engine->ignitionEvents.elements[10].coilIndex, 0);
EXPECT_EQ(engine->ignitionEvents.elements[11].cylinderNumber, 6); EXPECT_EQ(engine->ignitionEvents.elements[11].coilIndex, 6);
ASSERT_EQ(engine->ignitionEvents.elements[0].sparkAngle, 0); ASSERT_EQ(engine->ignitionEvents.elements[0].sparkAngle, 0);
ASSERT_EQ((void*)engine->ignitionEvents.elements[0].outputs[0], (void*)&enginePins.coils[0]); ASSERT_EQ((void*)engine->ignitionEvents.elements[0].outputs[0], (void*)&enginePins.coils[0]);