Fix git mess

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

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

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

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)