Skip to content

Commit

Permalink
cpu/esp8266: fix of set func in periph/pwm
Browse files Browse the repository at this point in the history
In the `pwm_set` function, the switch-on and switch-off times for PWM channels were only determined for the following phase, but not for the current phase. This could result in a missing duty cycle when calling the function `pwm_set` if the switch-on time of the current phase was not yet reached or to an extended duty cycle if the switch-off time of the current phase had not yet been reached.
  • Loading branch information
gschorcht committed Feb 10, 2019
1 parent 1f9e185 commit 70d121f
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions cpu/esp8266/periph/pwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,23 +183,31 @@ void pwm_set(pwm_t pwm, uint8_t channel, uint16_t value)
CHECK_PARAM (value <= _pwm_dev.res);

uint32_t state = irq_disable();
uint32_t phase = _pwm_dev.cycles - _pwm_dev.cycles % _pwm_dev.res + _pwm_dev.res;
uint32_t phase = _pwm_dev.cycles - _pwm_dev.cycles % _pwm_dev.res;
uint32_t next_on = phase;
uint32_t next_off;

switch (_pwm_dev.mode) {
case PWM_LEFT:
_pwm_dev.chn[channel].next_on = phase;
next_on = phase;
break;

case PWM_RIGHT:
_pwm_dev.chn[channel].next_on = phase + _pwm_dev.res - value;
next_on = phase + _pwm_dev.res - value;
break;

case PWM_CENTER:
_pwm_dev.chn[channel].next_on = phase + (_pwm_dev.res - value) / 2;
next_on = phase + (_pwm_dev.res - value) / 2;
break;
}

_pwm_dev.chn[channel].next_off = _pwm_dev.chn[channel].next_on + value;
next_off = next_on + value;

next_on = (_pwm_dev.cycles < next_on) ? next_on : next_on + _pwm_dev.res;
next_off = (_pwm_dev.cycles < next_off) ? next_off : next_off + _pwm_dev.res;

_pwm_dev.chn[channel].next_on = next_on;
_pwm_dev.chn[channel].next_off = next_off;
_pwm_dev.chn[channel].duty = value;

irq_restore(state);
Expand Down

0 comments on commit 70d121f

Please sign in to comment.