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

brutal encapsulation

This commit is contained in:
Andrey 2022-09-07 20:20:29 -04:00
parent e864675fd3
commit ae93591755
3 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
firmware/controllers/engine_cycle/main_trigger_callback.cpp
View File

@ -84,45 +84,6 @@ void turnInjectionPinHigh(InjectionEvent *event) {
}
}
void InjectorOutputPin::setHigh() {
NamedOutputPin::setHigh();
TunerStudioOutputChannels *state = getTunerStudioOutputChannels();
// this is NASTY but what's the better option? bytes? At cost of 22 extra bytes in output status packet?
switch (injectorIndex) {
case 0:
state->injectorState1 = true;
break;
case 1:
state->injectorState2 = true;
break;
case 2:
state->injectorState3 = true;
break;
case 3:
state->injectorState4 = true;
break;
}
}
void InjectorOutputPin::setLow() {
NamedOutputPin::setLow();
TunerStudioOutputChannels *state = getTunerStudioOutputChannels();
// this is NASTY but what's the better option? bytes? At cost of 22 extra bytes in output status packet?
switch (injectorIndex) {
case 0:
engine->outputChannels.injectorState1 = false;
break;
case 1:
engine->outputChannels.injectorState2 = false;
break;
case 2:
engine->outputChannels.injectorState3 = false;
break;
case 3:
engine->outputChannels.injectorState4 = false;
break;
}
}
void turnInjectionPinLow(InjectionEvent *event) {
efitick_t nowNt = getTimeNowNt();
@ -387,7 +348,7 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp, angle_
// Check if the engine is not stopped or cylinder cleanup is activated
static bool isPrimeInjectionPulseSkipped() {
if (!engine->rpmCalculator.isStopped())
if (!getEngineRotationState()->isStopped())
return true;
return engineConfiguration->isCylinderCleanupEnabled && (Sensor::getOrZero(SensorType::Tps1) > CLEANUP_MODE_TPS);
}

5
firmware/controllers/engine_cycle/rpm_calculator_api.h
View File

@ -10,6 +10,11 @@ class EngineRotationState {
public:
virtual floatus_t getOneDegreeUs() = 0;
virtual bool isCranking() const = 0;
/**
* Returns true if the engine is not spinning (RPM==0)
*/
virtual bool isStopped() const = 0;
virtual operation_mode_e getOperationMode() const = 0;
};

40
firmware/controllers/system/injection_gpio.cpp
View File

@ -72,3 +72,43 @@ void InjectorOutputPin::close(efitick_t nowNt) {
}
}
void InjectorOutputPin::setHigh() {
NamedOutputPin::setHigh();
TunerStudioOutputChannels *state = getTunerStudioOutputChannels();
// this is NASTY but what's the better option? bytes? At cost of 22 extra bytes in output status packet?
switch (injectorIndex) {
case 0:
state->injectorState1 = true;
break;
case 1:
state->injectorState2 = true;
break;
case 2:
state->injectorState3 = true;
break;
case 3:
state->injectorState4 = true;
break;
}
}
void InjectorOutputPin::setLow() {
NamedOutputPin::setLow();
TunerStudioOutputChannels *state = getTunerStudioOutputChannels();
// this is NASTY but what's the better option? bytes? At cost of 22 extra bytes in output status packet?
switch (injectorIndex) {
case 0:
state->injectorState1 = false;
break;
case 1:
state->injectorState2 = false;
break;
case 2:
state->injectorState3 = false;
break;
case 3:
state->injectorState4 = false;
break;
}
}