StackRduino
diff --git a/‎ports/esp32s2/Makefile‎
Lines changed: 1 addition & 1 deletion b/‎ports/esp32s2/Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎shared-module/displayio/FourWire.c‎
Lines changed: 3 additions & 1 deletion b/‎shared-module/displayio/FourWire.c‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎shared-module/displayio/I2CDisplay.c‎
Lines changed: 4 additions & 1 deletion b/‎shared-module/displayio/I2CDisplay.c‎
Lines changed: 4 additions & 1 deletion
@@ -125,7 +125,7 @@ CFLAGS += $(OPTIMIZATION_FLAGS)
 
 CFLAGS += $(INC) -Werror -Wall -mlongcalls -std=gnu11 -Wl,--gc-sections $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)
 
-LDFLAGS = $(CFLAGS) -Wl,-nostdlib  -Wl,-Map=$@.map -Wl,-cref
+LDFLAGS = $(CFLAGS) -Wl,-nostdlib  -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
 LDFLAGS += -L$(BUILD)/esp-idf/esp-idf/esp32s2 \
            -Tesp32s2_out.ld \
            -L$(BUILD)/esp-idf/esp-idf/esp32s2/ld \
 
@@ -76,7 +76,9 @@ void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t* self) {
 
     common_hal_reset_pin(self->command.pin);
     common_hal_reset_pin(self->chip_select.pin);
-    common_hal_reset_pin(self->reset.pin);
+    if (self->reset.pin) {
+        common_hal_reset_pin(self->reset.pin);
+    }
 }
 
 bool common_hal_displayio_fourwire_reset(mp_obj_t obj) {
 
@@ -53,6 +53,7 @@ void common_hal_displayio_i2cdisplay_construct(displayio_i2cdisplay_obj_t* self,
 
     // Probe the bus to see if a device acknowledges the given address.
     if (!common_hal_busio_i2c_probe(i2c, device_address)) {
+        self->base.type = &mp_type_NoneType;
         mp_raise_ValueError_varg(translate("Unable to find I2C Display at %x"), device_address);
     }
 
@@ -71,7 +72,9 @@ void common_hal_displayio_i2cdisplay_deinit(displayio_i2cdisplay_obj_t* self) {
         common_hal_busio_i2c_deinit(self->bus);
     }
 
-    common_hal_reset_pin(self->reset.pin);
+    if (self->reset.base.type == &digitalio_digitalinout_type) {
+        common_hal_digitalio_digitalinout_deinit(&self->reset);
+    }
 }
 
 bool common_hal_displayio_i2cdisplay_reset(mp_obj_t obj) {
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,9 @@ void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t* self) {`
`76`	`76`
`77`	`77`	`common_hal_reset_pin(self->command.pin);`
`78`	`78`	`common_hal_reset_pin(self->chip_select.pin);`
`79`		`- common_hal_reset_pin(self->reset.pin);`
	`79`	`+ if (self->reset.pin) {`
	`80`	`+ common_hal_reset_pin(self->reset.pin);`
	`81`	`+ }`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`bool common_hal_displayio_fourwire_reset(mp_obj_t obj) {`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ void common_hal_displayio_i2cdisplay_construct(displayio_i2cdisplay_obj_t* self,`
`53`	`53`
`54`	`54`	`// Probe the bus to see if a device acknowledges the given address.`
`55`	`55`	`if (!common_hal_busio_i2c_probe(i2c, device_address)) {`
	`56`	`+ self->base.type = &mp_type_NoneType;`
`56`	`57`	`mp_raise_ValueError_varg(translate("Unable to find I2C Display at %x"), device_address);`
`57`	`58`	`}`
`58`	`59`
`@@ -71,7 +72,9 @@ void common_hal_displayio_i2cdisplay_deinit(displayio_i2cdisplay_obj_t* self) {`
`71`	`72`	`common_hal_busio_i2c_deinit(self->bus);`
`72`	`73`	`}`
`73`	`74`
`74`		`- common_hal_reset_pin(self->reset.pin);`
	`75`	`+ if (self->reset.base.type == &digitalio_digitalinout_type) {`
	`76`	`+ common_hal_digitalio_digitalinout_deinit(&self->reset);`
	`77`	`+ }`
`75`	`78`	`}`
`76`	`79`
`77`	`80`	`bool common_hal_displayio_i2cdisplay_reset(mp_obj_t obj) {`