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

don't use us for pwm calculation (#1106)

This commit is contained in:
Matthew Kennedy 2020-01-19 04:02:49 -08:00 committed by rusefi
parent 7da4196f9c
commit 09dc2f2390
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/controllers/system/timer/pwm_generator_logic.cpp
View File

@ -98,7 +98,7 @@ void SimplePwm::setSimplePwmDutyCycle(float dutyCycle) {
/** /**
* returns absolute timestamp of state change * returns absolute timestamp of state change
*/ */
static efitimeus_t getNextSwitchTimeUs(PwmConfig *state) { static efitick_t getNextSwitchTimeNt(PwmConfig *state) {
efiAssert(CUSTOM_ERR_ASSERT, state->safe.phaseIndex < PWM_PHASE_MAX_COUNT, "phaseIndex range", 0); efiAssert(CUSTOM_ERR_ASSERT, state->safe.phaseIndex < PWM_PHASE_MAX_COUNT, "phaseIndex range", 0);
int iteration = state->safe.iteration; int iteration = state->safe.iteration;
// we handle PM_ZERO and PM_FULL separately // we handle PM_ZERO and PM_FULL separately
@ -117,7 +117,7 @@ static efitimeus_t getNextSwitchTimeUs(PwmConfig *state) {
#if DEBUG_PWM #if DEBUG_PWM
scheduleMsg(&logger, "start=%d timeToSwitch=%d", state->safe.start, timeToSwitch); scheduleMsg(&logger, "start=%d timeToSwitch=%d", state->safe.start, timeToSwitch);
#endif /* DEBUG_PWM */ #endif /* DEBUG_PWM */
return NT2US(state->safe.startNt + timeToSwitchNt); return state->safe.startNt + timeToSwitchNt;
} }
void PwmConfig::setFrequency(float frequency) { void PwmConfig::setFrequency(float frequency) {
@ -163,7 +163,7 @@ void PwmConfig::handleCycleStart() {
/** /**
* @return Next time for signal toggle * @return Next time for signal toggle
*/ */
efitimeus_t PwmConfig::togglePwmState() { efitick_t PwmConfig::togglePwmState() {
ScopePerf perf(PE::PwmConfigTogglePwmState); ScopePerf perf(PE::PwmConfigTogglePwmState);
if (isStopRequested) { if (isStopRequested) {
@ -180,7 +180,7 @@ efitimeus_t PwmConfig::togglePwmState() {
* NaN period means PWM is paused, we also set the pin low * NaN period means PWM is paused, we also set the pin low
*/ */
stateChangeCallback(0, arg); stateChangeCallback(0, arg);
return getTimeNowUs() + MS2US(NAN_FREQUENCY_SLEEP_PERIOD_MS); return getTimeNowNt() + MS2NT(NAN_FREQUENCY_SLEEP_PERIOD_MS);
} }
if (mode != PM_NORMAL) { if (mode != PM_NORMAL) {
// in case of ZERO or FULL we are always at starting index // in case of ZERO or FULL we are always at starting index
@ -209,7 +209,7 @@ efitimeus_t PwmConfig::togglePwmState() {
stateChangeCallback(cbStateIndex, arg); stateChangeCallback(cbStateIndex, arg);
} }
efitimeus_t nextSwitchTimeUs = getNextSwitchTimeUs(this); efitick_t nextSwitchTimeNt = getNextSwitchTimeNt(this);
#if DEBUG_PWM #if DEBUG_PWM
scheduleMsg(&logger, "%s: nextSwitchTime %d", state->name, nextSwitchTime); scheduleMsg(&logger, "%s: nextSwitchTime %d", state->name, nextSwitchTime);
#endif /* DEBUG_PWM */ #endif /* DEBUG_PWM */
@ -234,11 +234,11 @@ efitimeus_t PwmConfig::togglePwmState() {
safe.iteration++; safe.iteration++;
} }
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
printf("PWM: nextSwitchTimeUs=%d phaseIndex=%d iteration=%d\r\n", nextSwitchTimeUs, printf("PWM: nextSwitchTimeNt=%d phaseIndex=%d iteration=%d\r\n", nextSwitchTimeNt,
safe.phaseIndex, safe.phaseIndex,
safe.iteration); safe.iteration);
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */
return nextSwitchTimeUs; return nextSwitchTimeNt;
} }
/** /**
@ -252,8 +252,8 @@ static void timerCallback(PwmConfig *state) {
state->dbgNestingLevel++; state->dbgNestingLevel++;
efiAssertVoid(CUSTOM_ERR_6581, state->dbgNestingLevel < 25, "PWM nesting issue"); efiAssertVoid(CUSTOM_ERR_6581, state->dbgNestingLevel < 25, "PWM nesting issue");
efitimeus_t switchTimeUs = state->togglePwmState(); efitick_t switchTimeNt = state->togglePwmState();
if (switchTimeUs == 0) { if (switchTimeNt == 0) {
// we are here when PWM gets stopped // we are here when PWM gets stopped
return; return;
} }
@ -262,7 +262,7 @@ static void timerCallback(PwmConfig *state) {
return; return;
} }
state->executor->scheduleByTimestamp(&state->scheduling, switchTimeUs, { timerCallback, state }); state->executor->scheduleByTimestampNt(&state->scheduling, switchTimeNt, { timerCallback, state });
state->dbgNestingLevel--; state->dbgNestingLevel--;
} }

2
firmware/controllers/system/timer/pwm_generator_logic.h
View File

@ -83,7 +83,7 @@ public:
// todo: 'outputPins' should be extracted away from here since technically one can want PWM scheduler without actual pin output // todo: 'outputPins' should be extracted away from here since technically one can want PWM scheduler without actual pin output
OutputPin *outputPins[PWM_PHASE_MAX_WAVE_PER_PWM]; OutputPin *outputPins[PWM_PHASE_MAX_WAVE_PER_PWM];
MultiChannelStateSequence multiChannelStateSequence; MultiChannelStateSequence multiChannelStateSequence;
efitimeus_t togglePwmState(); efitick_t togglePwmState();
void stop(); void stop();
int dbgNestingLevel; int dbgNestingLevel;