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

nano progress

This commit is contained in:
rusefi 2019-07-10 02:27:24 -04:00
parent 6c7870d1b5
commit 2d9e669ad5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/controllers/actuators/aux_pid.cpp
View File

@ -37,9 +37,6 @@ extern fsio8_Map3D_f32t fsioTable1;
extern TunerStudioOutputChannels tsOutputChannels; extern TunerStudioOutputChannels tsOutputChannels;
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */
static SimplePwm auxPidPwm[AUX_PID_COUNT];
static OutputPin auxPidPin[AUX_PID_COUNT];
static pid_s *auxPidS = &persistentState.persistentConfiguration.engineConfiguration.auxPid[0]; static pid_s *auxPidS = &persistentState.persistentConfiguration.engineConfiguration.auxPid[0];
static Pid auxPid(auxPidS); static Pid auxPid(auxPidS);
static Logging *logger; static Logging *logger;
@ -66,6 +63,10 @@ class AuxPidController : public PeriodicTimerController {
public: public:
int index = 0; int index = 0;
SimplePwm auxPidPwm;
OutputPin auxOutputPin;
int getPeriodMs() override { int getPeriodMs() override {
return engineConfiguration->auxPidPins[index] == GPIO_UNASSIGNED ? NO_PIN_PERIOD : GET_PERIOD_LIMITED(&engineConfiguration->auxPid[index]); return engineConfiguration->auxPidPins[index] == GPIO_UNASSIGNED ? NO_PIN_PERIOD : GET_PERIOD_LIMITED(&engineConfiguration->auxPid[index]);
} }
@ -104,7 +105,7 @@ public:
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */
} }
auxPidPwm[index].setSimplePwmDutyCycle(pwm / 100); auxPidPwm.setSimplePwmDutyCycle(pwm / 100);
} }
@ -121,10 +122,10 @@ static void turnAuxPidOn(int index) {
return; return;
} }
startSimplePwmExt(&auxPidPwm[index], "Aux PID", startSimplePwmExt(&instances[index].auxPidPwm, "Aux PID",
&engine->executor, &engine->executor,
engineConfiguration->auxPidPins[index], engineConfiguration->auxPidPins[index],
&auxPidPin[0], &instances[index].auxOutputPin,
engineConfiguration->auxPidFrequency[index], 0.1, (pwm_gen_callback*)applyPinState); engineConfiguration->auxPidFrequency[index], 0.1, (pwm_gen_callback*)applyPinState);
} }