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

auto-sync

This commit is contained in:
rusEfi 2014-10-15 16:02:58 -05:00
parent b05d93f874
commit 65c46cacd3
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/ec2.h
View File

@ -56,6 +56,12 @@ public:
* voltage divider configuration. This is a future (?) performance optimization.
*/
float adcToVoltageInputDividerCoefficient;
/**
* This field is true if we are in 'cylinder cleanup' state right now
* see isCylinderCleanupEnabled
*/
bool isCylinderCleanupMode;
};
typedef struct {

16
firmware/controllers/engine_controller.cpp
View File

@ -168,6 +168,20 @@ int getTimeNowSeconds(void) {
return chTimeNow() / CH_FREQUENCY;
}
static void cylinderCleanupControl(Engine *engine) {
bool newValue;
if (engineConfiguration->isCylinderCleanupEnabled) {
newValue = !engine->rpmCalculator->isRunning() && getTPS() > 95;
} else {
newValue = false;
}
if (newValue != engineConfiguration2->isCylinderCleanupMode) {
engineConfiguration2->isCylinderCleanupMode = newValue;
scheduleMsg(&logger, "isCylinderCleanupMode %s", boolToString(newValue));
}
}
static void onEvenyGeneralMilliseconds(void *arg) {
(void) arg;
/**
@ -205,6 +219,8 @@ static void onEvenyGeneralMilliseconds(void *arg) {
fanRelayControl();
cylinderCleanupControl(&engine);
setOutputPinValue(O2_HEATER, engine.rpmCalculator->isRunning());
// schedule next invocation

17
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -87,6 +87,9 @@ static void handleFuelInjectionEvent(MainTriggerCallback *mainTriggerCallback, A
return;
}
if (mainTriggerCallback->engineConfiguration2->isCylinderCleanupMode)
return;
float delay = getOneDegreeTimeMs(rpm) * event->position.angleOffset;
// if (isCranking())
@ -107,9 +110,9 @@ static void handleFuel(Engine *engine, MainTriggerCallback *mainTriggerCallback,
* fueling strategy
*/
ActuatorEventList *source =
isCrankingR(rpm) ?
&mainTriggerCallback->engineConfiguration2->engineEventConfiguration.crankingInjectionEvents :
&mainTriggerCallback->engineConfiguration2->engineEventConfiguration.injectionEvents;
isCrankingR(rpm) ?
&mainTriggerCallback->engineConfiguration2->engineEventConfiguration.crankingInjectionEvents :
&mainTriggerCallback->engineConfiguration2->engineEventConfiguration.injectionEvents;
for (int i = 0; i < source->size; i++) {
ActuatorEvent *event = &source->events[i];
@ -119,7 +122,8 @@ static void handleFuel(Engine *engine, MainTriggerCallback *mainTriggerCallback,
}
}
static void handleSparkEvent(MainTriggerCallback *mainTriggerCallback, uint32_t eventIndex, IgnitionEvent *iEvent, int rpm) {
static void handleSparkEvent(MainTriggerCallback *mainTriggerCallback, uint32_t eventIndex, IgnitionEvent *iEvent,
int rpm) {
engine_configuration_s *engineConfiguration = mainTriggerCallback->engineConfiguration;
engine_configuration2_s *engineConfiguration2 = mainTriggerCallback->engineConfiguration2;
@ -183,7 +187,8 @@ static void handleSparkEvent(MainTriggerCallback *mainTriggerCallback, uint32_t
}
}
static void handleSpark(MainTriggerCallback *mainTriggerCallback, uint32_t eventIndex, int rpm, IgnitionEventList *list) {
static void handleSpark(MainTriggerCallback *mainTriggerCallback, uint32_t eventIndex, int rpm,
IgnitionEventList *list) {
if (!isValidRpm(rpm) || !mainTriggerCallback->engineConfiguration->isIgnitionEnabled)
return; // this might happen for instance in case of a single trigger event after a pause
@ -233,7 +238,7 @@ extern Engine engine;
* Both injection and ignition are controlled from this method.
*/
void onTriggerEvent(trigger_event_e ckpSignalType, uint32_t eventIndex, MainTriggerCallback *mainTriggerCallback) {
(void)ckpSignalType;
(void) ckpSignalType;
efiAssertVoid(eventIndex < 2 * mainTriggerCallback->engineConfiguration2->triggerShape.shaftPositionEventCount,
"event index");
efiAssertVoid(getRemainingStack(chThdSelf()) > 16, "stack#3");