From b8aaa42abf42e29f184285c1f67a05c0bee3d54d Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Wed, 4 May 2022 10:03:58 +0100
Subject: [PATCH] Fix git mess

---
 drivers/ssd1351/ssd1351_16bit.py   | 1 -
 drivers/ssd1351/ssd1351_4bit.py    | 1 -
 drivers/ssd1351/ssd1351_generic.py | 1 -
 setup_examples/st7735r_esp32.py    | 6 +++---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/ssd1351/ssd1351_16bit.py b/drivers/ssd1351/ssd1351_16bit.py
index 4d30605..18cd898 100644
--- a/drivers/ssd1351/ssd1351_16bit.py
+++ b/drivers/ssd1351/ssd1351_16bit.py
@@ -14,7 +14,6 @@ import framebuf
 import utime
 import gc
 import micropython
-from uctypes import addressof
 from drivers.boolpalette import BoolPalette
 
 # https://github.com/peterhinch/micropython-nano-gui/issues/2
diff --git a/drivers/ssd1351/ssd1351_4bit.py b/drivers/ssd1351/ssd1351_4bit.py
index e43f79d..bc02ab5 100644
--- a/drivers/ssd1351/ssd1351_4bit.py
+++ b/drivers/ssd1351/ssd1351_4bit.py
@@ -15,7 +15,6 @@ import framebuf
 import utime
 import gc
 import micropython
-from uctypes import addressof
 from drivers.boolpalette import BoolPalette
 
 # https://github.com/peterhinch/micropython-nano-gui/issues/2
diff --git a/drivers/ssd1351/ssd1351_generic.py b/drivers/ssd1351/ssd1351_generic.py
index 589c2a8..e2e284b 100644
--- a/drivers/ssd1351/ssd1351_generic.py
+++ b/drivers/ssd1351/ssd1351_generic.py
@@ -16,7 +16,6 @@ import framebuf
 import utime
 import gc
 import micropython
-from uctypes import addressof
 from drivers.boolpalette import BoolPalette
 
 import sys
diff --git a/setup_examples/st7735r_esp32.py b/setup_examples/st7735r_esp32.py
index 6761fa4..e0ef2c5 100644
--- a/setup_examples/st7735r_esp32.py
+++ b/setup_examples/st7735r_esp32.py
@@ -25,11 +25,11 @@
 from machine import SPI, Pin
 import gc
 #from drivers.ssd1351.ssd1351_generic import SSD1351 as SSD
-#from drivers.st7735r.st7735r import ST7735R as SSD
+from drivers.st7735r.st7735r import ST7735R as SSD
 #from drivers.st7735r.st7735r144 import ST7735R as SSD
-from drivers.st7735r.st7735r_4bit import ST7735R as SSD
+#from drivers.st7735r.st7735r_4bit import ST7735R as SSD
 
-height = 96   # SSD1351: ensure height is correct (96/128)
+height = 128   # Ensure height is correct
 
 pdc = Pin(27, Pin.OUT, value=0)  # Arbitrary pins
 pcs = Pin(25, Pin.OUT, value=1)