Fixed merge

2021-03-02 22:32:59 -06:00 · 2021-03-02 22:32:59 -06:00 · 98075c5255
commit 98075c5255
parent 37ee18349f
1 changed files with 1 additions and 0 deletions
--- a/ports/raspberrypi/common-hal/pwmio/PWMOut.c
+++ b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
@ -82,6 +82,7 @@ void pwmio_release_slice_channels(uint8_t slice) {
    channel_use &= ~channel_mask;
    channel_mask = _mask(slice, 1);
    channel_use &= ~channel_mask;
+}

 void pwmout_never_reset(uint8_t slice, uint8_t channel) {
    never_reset_channel |= _mask(slice, channel);