From f95ad7b27c040e54daeb4c71d6bb6c35844be66e Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Thu, 10 Sep 2020 15:37:43 -0400
Subject: Fix reset pin null reference, construct error null reference

---
 shared-module/displayio/I2CDisplay.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'shared-module/displayio/I2CDisplay.c')

diff --git a/shared-module/displayio/I2CDisplay.c b/shared-module/displayio/I2CDisplay.c
index 0c8f2e69a..9e9e17881 100644
--- a/shared-module/displayio/I2CDisplay.c
+++ b/shared-module/displayio/I2CDisplay.c
@@ -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.pin) {
+        common_hal_reset_pin(self->reset.pin);
+    }
 }
 
 bool common_hal_displayio_i2cdisplay_reset(mp_obj_t obj) {
-- 
cgit v1.2.3


From e504438fd223c9bb0b9d6950a699f1283ece137c Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Mon, 14 Sep 2020 11:58:13 -0400
Subject: Remove unlicensed file, fix reset pin type check

---
 ports/esp32s2/boards/esp32s2-saola-1.cfg | 41 --------------------------------
 shared-module/displayio/I2CDisplay.c     |  4 ++--
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 ports/esp32s2/boards/esp32s2-saola-1.cfg

(limited to 'shared-module/displayio/I2CDisplay.c')

diff --git a/ports/esp32s2/boards/esp32s2-saola-1.cfg b/ports/esp32s2/boards/esp32s2-saola-1.cfg
deleted file mode 100644
index 677290757..000000000
--- a/ports/esp32s2/boards/esp32s2-saola-1.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-# The ESP32-S2 only supports JTAG.
-transport select jtag
-adapter_khz 1000
-
-# Source the ESP common configuration file
-source [find target/esp_common.cfg]
-
-if { [info exists CHIPNAME] } {
-    set _CHIPNAME $CHIPNAME
-} else {
-    set _CHIPNAME esp32s2
-}
-
-if { [info exists CPUTAPID] } {
-    set _CPUTAPID $CPUTAPID
-} else {
-    set _CPUTAPID 0x120034e5
-}
-
-set _TARGETNAME $_CHIPNAME
-set _CPUNAME cpu
-set _TAPNAME $_CHIPNAME.$_CPUNAME
-
-jtag newtap $_CHIPNAME $_CPUNAME -irlen 5 -expected-id $_CPUTAPID
-
-if { $_RTOS == "none" } {
-    target create $_TARGETNAME esp32s2 -endian little -chain-position $_TAPNAME
-} else {
-    target create $_TARGETNAME esp32s2 -endian little -chain-position $_TAPNAME -rtos $_RTOS
-}
-
-configure_esp_workarea $_TARGETNAME 0x40030000 0x3400 0x3FFE0000 0x6000
-configure_esp_flash_bank $_TARGETNAME $_TARGETNAME $_FLASH_SIZE
-
-xtensa maskisr on
-if { $_SEMIHOST_BASEDIR != "" } {
-    esp semihost_basedir $_SEMIHOST_BASEDIR
-}
-if { $_FLASH_SIZE == 0 } {
-    gdb_breakpoint_override hard
-}
diff --git a/shared-module/displayio/I2CDisplay.c b/shared-module/displayio/I2CDisplay.c
index 9e9e17881..5bd03dcd6 100644
--- a/shared-module/displayio/I2CDisplay.c
+++ b/shared-module/displayio/I2CDisplay.c
@@ -72,8 +72,8 @@ void common_hal_displayio_i2cdisplay_deinit(displayio_i2cdisplay_obj_t* self) {
         common_hal_busio_i2c_deinit(self->bus);
     }
 
-    if (self->reset.pin) {
-        common_hal_reset_pin(self->reset.pin);
+    if (self->reset.base.type == &digitalio_digitalinout_type) {
+        common_hal_digitalio_digitalinout_deinit(&self->reset);
     }
 }
 
-- 
cgit v1.2.3