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

only: encapsulation/better name

This commit is contained in:
Andrey 2024-02-28 21:44:02 -05:00
parent 86d21fffa9
commit 002a2ce016
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,10 @@ struct AngleBasedEvent {
*/
AngleBasedEvent *nextToothEvent = nullptr;
angle_t enginePhase;
// angular position of this event
angle_t getAngle() const {
return enginePhase;
}
void setAngle(angle_t p_enginePhase) {
enginePhase = p_enginePhase;
@ -29,6 +32,8 @@ struct AngleBasedEvent {
bool shouldSchedule(float currentPhase, float nextPhase) const;
float getAngleFromNow(float currentPhase) const;
private:
angle_t enginePhase;
};
#define MAX_OUTPUTS_FOR_IGNITION 2

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

@ -402,7 +402,7 @@ static void scheduleSparkEvent(bool limitedSpark, IgnitionEvent *event,
#if EFI_UNIT_TEST
if (verboseMode) {
printf("spark dwell@ %.1f spark@ %.2f id=%d\r\n", event->dwellAngle,
event->sparkEvent.enginePhase,
event->sparkEvent.getAngle(),
event->sparkId);
}
#endif

4
firmware/controllers/system/timer/trigger_scheduler.cpp
View File

@ -45,10 +45,10 @@ bool TriggerScheduler::scheduleOrQueue(const char *msg, AngleBasedEvent *event,
}
void TriggerScheduler::schedule(const char *msg, AngleBasedEvent* event, action_s action) {
if (event->enginePhase < 0) {
if (event->getAngle() < 0) {
// at the moment we expect API consumer to wrap angle. shall we do the wrapping in the enginePhase setter?
// i.e. what is the best level to take care of the range constraint?
criticalError("Negative angle %s %f", msg, event->enginePhase);
criticalError("Negative angle %s %f", msg, event->getAngle());
}
event->action = action;

2
unit_tests/test-framework/engine_test_helper.cpp
View File

@ -320,7 +320,7 @@ const AngleBasedEvent * EngineTestHelper::assertTriggerEvent(const char *msg,
assertEqualsM4(msg, " callback up/down", (void*)event->action.getCallback() == (void*) callback, 1);
}
assertEqualsM4(msg, " angle", enginePhase, event->enginePhase);
assertEqualsM4(msg, " angle", enginePhase, event->getAngle());
return event;
}