Merge pull request adafruit#4165 from DavePutz/issue_4143

tannewt · web-flow · commit b19c700d4a31 · 2021-02-09T14:30:39.000-08:00
Issue 4143 - Fixed marking a PWM slice incorrectly as variable frequency
diff --git 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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t* self,`
`107`	`107`	`if (variable_frequency) {`
`108`	`108`	`return PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;`
`109`	`109`	`}`
`110`		`- // If the other user wants to change frequency then we can't share either.`
	`110`	`+ // If the other user wants a variable frequency then we can't share either.`
`111`	`111`	`if ((slice_fixed_frequency & (1 << slice)) != 0) {`
`112`	`112`	`return PWMOUT_ALL_TIMERS_ON_PIN_IN_USE;`
`113`	`113`	`}`
`@@ -119,7 +119,7 @@ pwmout_result_t common_hal_pwmio_pwmout_construct(pwmio_pwmout_obj_t* self,`
`119`	`119`	`self->slice = slice;`
`120`	`120`	`self->channel = channel;`
`121`	`121`	`channel_use \|= channel_use_mask;`
`122`		`- if (!variable_frequency) {`
	`122`	`+ if (variable_frequency) {`
`123`	`123`	`slice_fixed_frequency \|= 1 << slice;`
`124`	`124`	`}`
`125`	`125`