Do not allow a *io object to be used after deinit().

Fixes #278, #277, #276, #275.

2 files changed, 29 insertions, 23 deletions

diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c
index 213fbc669..1d9123312 100644
--- a/shared-bindings/touchio/TouchIn.c
+++ b/shared-bindings/touchio/TouchIn.c
@@ -35,6 +35,7 @@
 #include "py/runtime.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/touchio/TouchIn.h"
+#include "shared-bindings/util.h"
 
 //| .. currentmodule:: touchio
 //|
@@ -113,8 +114,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(touchio_touchin___exit___obj, 4, 4, t
 //|     :rtype: bool
 //|
 STATIC mp_obj_t touchio_touchin_obj_get_value(mp_obj_t self_in) {
-   touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-   return mp_obj_new_bool(common_hal_touchio_touchin_get_value(self));
+    touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    raise_error_if_deinited(common_hal_touchio_touchin_deinited(self));
+    return mp_obj_new_bool(common_hal_touchio_touchin_get_value(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_get_value_obj, touchio_touchin_obj_get_value);
 
@@ -134,17 +136,18 @@ const mp_obj_property_t touchio_touchin_value_obj = {
 //|     :rtype: int
 //|
 STATIC mp_obj_t touchio_touchin_obj_get_raw_value(mp_obj_t self_in) {
-	touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-	return MP_OBJ_NEW_SMALL_INT(common_hal_touchio_touchin_get_raw_value(self));
+    touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    raise_error_if_deinited(common_hal_touchio_touchin_deinited(self));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_touchio_touchin_get_raw_value(self));
 }
 
 MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_get_raw_value_obj, touchio_touchin_obj_get_raw_value);
 
 const mp_obj_property_t touchio_touchin_raw_value_obj = {
-	.base.type = &mp_type_property,
-	.proxy = {(mp_obj_t)&touchio_touchin_get_raw_value_obj,
-                  (mp_obj_t)&mp_const_none_obj,
-                  (mp_obj_t)&mp_const_none_obj},
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&touchio_touchin_get_raw_value_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
  };
 
 
@@ -160,31 +163,33 @@ const mp_obj_property_t touchio_touchin_raw_value_obj = {
 //|     :rtype: int
 //|
 STATIC mp_obj_t touchio_touchin_obj_get_threshold(mp_obj_t self_in) {
-	touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-	return MP_OBJ_NEW_SMALL_INT(common_hal_touchio_touchin_get_threshold(self));
+    touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    raise_error_if_deinited(common_hal_touchio_touchin_deinited(self));
+    return MP_OBJ_NEW_SMALL_INT(common_hal_touchio_touchin_get_threshold(self));
 }
 
 MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_get_threshold_obj, touchio_touchin_obj_get_threshold);
 
 STATIC mp_obj_t touchio_touchin_obj_set_threshold(mp_obj_t self_in, mp_obj_t threshold_obj) {
-	touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-        uint32_t new_threshold = mp_obj_get_int(threshold_obj);
-        if (new_threshold < 0 || new_threshold > UINT16_MAX) {
-            // I would use MP_STRINGIFY(UINT16_MAX), but that prints "0xffff" instead of 65536.
-            mp_raise_ValueError("threshold must be in the range 0-65536");
-        }
-	common_hal_touchio_touchin_set_threshold(self, new_threshold);
-        return mp_const_none;
+    touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    raise_error_if_deinited(common_hal_touchio_touchin_deinited(self));
+    uint32_t new_threshold = mp_obj_get_int(threshold_obj);
+    if (new_threshold < 0 || new_threshold > UINT16_MAX) {
+        // I would use MP_STRINGIFY(UINT16_MAX), but that prints "0xffff" instead of 65536.
+        mp_raise_ValueError("threshold must be in the range 0-65536");
+    }
+    common_hal_touchio_touchin_set_threshold(self, new_threshold);
+    return mp_const_none;
 }
 
 MP_DEFINE_CONST_FUN_OBJ_2(touchio_touchin_set_threshold_obj, touchio_touchin_obj_set_threshold);
 
 const mp_obj_property_t touchio_touchin_threshold_obj = {
-	.base.type = &mp_type_property,
-	.proxy = {(mp_obj_t)&touchio_touchin_get_threshold_obj,
-                  (mp_obj_t)&touchio_touchin_set_threshold_obj,
-                  (mp_obj_t)&mp_const_none_obj},
- };
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&touchio_touchin_get_threshold_obj,
+              (mp_obj_t)&touchio_touchin_set_threshold_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
 
 
 STATIC const mp_rom_map_elem_t touchio_touchin_locals_dict_table[] = {
diff --git a/shared-bindings/touchio/TouchIn.h b/shared-bindings/touchio/TouchIn.h
index 0570afb20..2e5c51607 100644
--- a/shared-bindings/touchio/TouchIn.h
+++ b/shared-bindings/touchio/TouchIn.h
@@ -34,6 +34,7 @@ extern const mp_obj_type_t touchio_touchin_type;
 
 void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self, const mcu_pin_obj_t *pin);
 void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self);
+bool common_hal_touchio_touchin_deinited(touchio_touchin_obj_t* self);
 bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self);
 uint16_t common_hal_touchio_touchin_get_raw_value(touchio_touchin_obj_t *self);
 uint16_t common_hal_touchio_touchin_get_threshold(touchio_touchin_obj_t *self);