From 98075c525515f9104e93100c180cadc3b9e8fc69 Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Tue, 2 Mar 2021 22:32:59 -0600 Subject: [PATCH] Fixed merge --- ports/raspberrypi/common-hal/pwmio/PWMOut.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/raspberrypi/common-hal/pwmio/PWMOut.c b/ports/raspberrypi/common-hal/pwmio/PWMOut.c index 4343b9e5cc..fd85fbf55b 100644 --- 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);