Merge pull request #6743 from Sciss/patch-1

dhalbert · web-flow · commit d645e9cad8b1 · 2022-08-11T09:27:18.000-04:00
Touchin.c - fix clean up in constructor before exception is thrown
diff --git a/shared-module/touchio/TouchIn.c b/shared-module/touchio/TouchIn.c
@@ -78,6 +78,7 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t *self, const mcu
 
     uint16_t raw_reading = get_raw_reading(self);
     if (raw_reading == TIMEOUT_TICKS) {
+        common_hal_touchio_touchin_deinit(self);
         mp_raise_ValueError(translate("No pulldown on pin; 1Mohm recommended"));
     }
     self->threshold = raw_reading * 1.05 + 100;

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t *self, const mcu`
`78`	`78`
`79`	`79`	`uint16_t raw_reading = get_raw_reading(self);`
`80`	`80`	`if (raw_reading == TIMEOUT_TICKS) {`
	`81`	`+ common_hal_touchio_touchin_deinit(self);`
`81`	`82`	`mp_raise_ValueError(translate("No pulldown on pin; 1Mohm recommended"));`
`82`	`83`	`}`
`83`	`84`	`self->threshold = raw_reading * 1.05 + 100;`