summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott@adafruit.com>2021-02-09 14:30:39 -0800
committerGitHub <noreply@github.com>2021-02-09 14:30:39 -0800
commitb19c700d4a312003b549876ab9abddc7dbb9abda (patch)
treefc025b2a7b704679fe172636e801f24b5b85fd50
parentcd05aa52230f10c0613aa43082ef4487907dab8c (diff)
parent9a28f0bf455f8a13522fd8454e05b7bcd67ecb99 (diff)
Merge pull request #4165 from DavePutz/issue_4143
Issue 4143 - Fixed marking a PWM slice incorrectly as variable frequency
-rw-r--r--ports/raspberrypi/common-hal/pwmio/PWMOut.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/raspberrypi/common-hal/pwmio/PWMOut.c b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
index 567ec5ef5..3d8979a03 100644
--- a/ports/raspberrypi/common-hal/pwmio/PWMOut.c
+++ b/ports/raspberrypi/common-hal/pwmio/PWMOut.c
@@ -107,7 +107,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t* self,
if (variable_frequency) {
return PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;
}
- // If the other user wants to change frequency then we can't share either.
+ // If the other user wants a variable frequency then we can't share either.
if ((slice_fixed_frequency & (1 << slice)) != 0) {
return PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;
}
@@ -119,7 +119,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t* self,
self->slice = slice;
self->channel = channel;
channel_use |= channel_use_mask;
- if (!variable_frequency) {
+ if (variable_frequency) {
slice_fixed_frequency |= 1 << slice;
}