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

eliminate idle's custom applyPinState (#2273) 

* remove

* not static
This commit is contained in:
Matthew Kennedy 2021-02-04 14:04:37 -08:00 committed by GitHub
parent cf9f9ae8fc
commit 7bd3979595
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
firmware/controllers/actuators/idle_hardware.cpp
View File

@ -40,6 +40,8 @@ static percent_t idlePositionSensitivityThreshold = 0.0f;
static SimplePwm idleSolenoidOpen("idle open"); static SimplePwm idleSolenoidOpen("idle open");
static SimplePwm idleSolenoidClose("idle close"); static SimplePwm idleSolenoidClose("idle close");
extern efitimeus_t timeToStopIdleTest;
void applyIACposition(percent_t position DECLARE_ENGINE_PARAMETER_SUFFIX) { void applyIACposition(percent_t position DECLARE_ENGINE_PARAMETER_SUFFIX) {
bool prettyClose = absF(position - engine->engineState.idle.currentIdlePosition) < idlePositionSensitivityThreshold; bool prettyClose = absF(position - engine->engineState.idle.currentIdlePosition) < idlePositionSensitivityThreshold;
// The threshold is dependent on IAC type (see initIdleHardware()) // The threshold is dependent on IAC type (see initIdleHardware())
@ -63,6 +65,13 @@ void applyIACposition(percent_t position DECLARE_ENGINE_PARAMETER_SUFFIX) {
iacMotor.setTargetPosition(duty * engineConfiguration->idleStepperTotalSteps); iacMotor.setTargetPosition(duty * engineConfiguration->idleStepperTotalSteps);
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */
} else { } else {
// if not spinning or running a bench test, turn off the idle valve(s) to be quieter and save power
if (engine->triggerCentral.getTimeSinceTriggerEvent(getTimeNowNt()) > 1.0f && timeToStopIdleTest == 0) {
idleSolenoidOpen.setSimplePwmDutyCycle(0);
idleSolenoidClose.setSimplePwmDutyCycle(0);
return;
}
if (!CONFIG(isDoubleSolenoidIdle)) { if (!CONFIG(isDoubleSolenoidIdle)) {
idleSolenoidOpen.setSimplePwmDutyCycle(duty); idleSolenoidOpen.setSimplePwmDutyCycle(duty);
} else { } else {
@ -80,23 +89,6 @@ void applyIACposition(percent_t position DECLARE_ENGINE_PARAMETER_SUFFIX) {
} }
#if !EFI_UNIT_TEST #if !EFI_UNIT_TEST
extern efitimeus_t timeToStopIdleTest;
static void applyIdleSolenoidPinState(int stateIndex, PwmConfig *state) /* pwm_gen_callback */ {
efiAssertVoid(CUSTOM_ERR_6645, stateIndex < PWM_PHASE_MAX_COUNT, "invalid stateIndex");
efiAssertVoid(CUSTOM_ERR_6646, state->multiChannelStateSequence.waveCount == 1, "invalid idle waveCount");
OutputPin *output = state->outputPins[0];
int value = state->multiChannelStateSequence.getChannelState(/*channelIndex*/0, stateIndex);
/**
* - we want stopped engine to be silent to facilitate bench testing of low volume stuff like coil spark
* - we want stopped engine to draw as little amps as possible
*/
if (!value /* always allow turning solenoid off */ ||
(GET_RPM() != 0 || timeToStopIdleTest != 0) /* do not run solenoid unless engine is spinning or bench testing in progress */
) {
output->setValue(value);
}
}
bool isIdleHardwareRestartNeeded() { bool isIdleHardwareRestartNeeded() {
return isConfigurationChanged(stepperEnablePin) || return isConfigurationChanged(stepperEnablePin) ||
@ -104,7 +96,6 @@ bool isIdleHardwareRestartNeeded() {
isConfigurationChanged(idle.stepperStepPin) || isConfigurationChanged(idle.stepperStepPin) ||
isConfigurationChanged(idle.solenoidFrequency) || isConfigurationChanged(idle.solenoidFrequency) ||
isConfigurationChanged(useStepperIdle) || isConfigurationChanged(useStepperIdle) ||
// isConfigurationChanged() ||
isConfigurationChanged(useETBforIdleControl) || isConfigurationChanged(useETBforIdleControl) ||
isConfigurationChanged(idle.solenoidPin) || isConfigurationChanged(idle.solenoidPin) ||
isConfigurationChanged(secondSolenoidPin); isConfigurationChanged(secondSolenoidPin);
@ -163,12 +154,10 @@ void initIdleHardware(Logging* sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
* Start PWM for idleValvePin * Start PWM for idleValvePin
*/ */
// todo: even for double-solenoid mode we can probably use same single SimplePWM // todo: even for double-solenoid mode we can probably use same single SimplePWM
// todo: open question why do we pass 'OutputPin' into 'startSimplePwmExt' if we have custom applyIdleSolenoidPinState listener anyway?
startSimplePwm(&idleSolenoidOpen, "Idle Valve Open", startSimplePwm(&idleSolenoidOpen, "Idle Valve Open",
&engine->executor, &engine->executor,
&enginePins.idleSolenoidPin, &enginePins.idleSolenoidPin,
CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)), CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)));
(pwm_gen_callback*)applyIdleSolenoidPinState);
if (CONFIG(isDoubleSolenoidIdle)) { if (CONFIG(isDoubleSolenoidIdle)) {
if (!isBrainPinValid(CONFIG(secondSolenoidPin))) { if (!isBrainPinValid(CONFIG(secondSolenoidPin))) {
@ -179,8 +168,7 @@ void initIdleHardware(Logging* sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
startSimplePwm(&idleSolenoidClose, "Idle Valve Close", startSimplePwm(&idleSolenoidClose, "Idle Valve Close",
&engine->executor, &engine->executor,
&enginePins.secondIdleSolenoidPin, &enginePins.secondIdleSolenoidPin,
CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)), CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)));
(pwm_gen_callback*)applyIdleSolenoidPinState);
} }
idlePositionSensitivityThreshold = 0.0f; idlePositionSensitivityThreshold = 0.0f;