Merge pull request #10190 from eightycc/issue-10004

dhalbert · web-flow · commit 98cfac4fadb9 · 2025-03-27T13:42:10.000-04:00
Add guards to common_hal_pulseio_pulse(in|out)_deinit to prevent doub…
diff --git a/ports/espressif/common-hal/pulseio/PulseIn.c b/ports/espressif/common-hal/pulseio/PulseIn.c
@@ -127,6 +127,9 @@ bool common_hal_pulseio_pulsein_deinited(pulseio_pulsein_obj_t *self) {
 }
 
 void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t *self) {
+    if (common_hal_pulseio_pulsein_deinited(self)) {
+        return;
+    }
     rmt_disable(self->channel);
     reset_pin_number(self->pin->number);
     rmt_del_channel(self->channel);
diff --git a/ports/espressif/common-hal/pulseio/PulseOut.c b/ports/espressif/common-hal/pulseio/PulseOut.c
@@ -54,6 +54,9 @@ bool common_hal_pulseio_pulseout_deinited(pulseio_pulseout_obj_t *self) {
 }
 
 void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t *self) {
+    if (common_hal_pulseio_pulseout_deinited(self)) {
+        return;
+    }
     rmt_disable(self->channel);
     rmt_del_encoder(self->encoder);
     rmt_del_channel(self->channel);

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,9 @@ bool common_hal_pulseio_pulsein_deinited(pulseio_pulsein_obj_t *self) {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t *self) {`
	`130`	`+ if (common_hal_pulseio_pulsein_deinited(self)) {`
	`131`	`+ return;`
	`132`	`+ }`
`130`	`133`	`rmt_disable(self->channel);`
`131`	`134`	`reset_pin_number(self->pin->number);`
`132`	`135`	`rmt_del_channel(self->channel);`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ bool common_hal_pulseio_pulseout_deinited(pulseio_pulseout_obj_t *self) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t *self) {`
	`57`	`+ if (common_hal_pulseio_pulseout_deinited(self)) {`
	`58`	`+ return;`
	`59`	`+ }`
`57`	`60`	`rmt_disable(self->channel);`
`58`	`61`	`rmt_del_encoder(self->encoder);`
`59`	`62`	`rmt_del_channel(self->channel);`