Revert "Merge branch 'ssd1883' into UC8197"

This reverts commit c69536e, reversing
changes made to 6b19e3e.

Author: BlitzCityDIY

adafruit_epd/ssd1680.py

@@ -242,7 +242,7 @@ def power_up(self):
 
         self.command(
             _SSD1680_DRIVER_CONTROL,
-            bytearray([self._height & 0xFF, (self._height) >> 8, 0x00]),
+            bytearray([self._height, (self._height) >> 8, 0x00]),
         )
         self.command(_SSD1680_DATA_MODE, bytearray([0x03]))
 
@@ -251,19 +251,19 @@ def power_up(self):
         self.command(_SSD1680_GATE_VOLTAGE, bytearray([0x17]))
         self.command(_SSD1680_SOURCE_VOLTAGE, bytearray([0x41, 0x00, 0x32]))
 
-        self.command(_SSD1680_SET_RAMXPOS, bytearray([0x00, (self._width // 8) - 1]))
+        self.command(_SSD1680_SET_RAMXPOS, bytearray([0x00, (self._width // 8)]))
         self.command(
             _SSD1680_SET_RAMYPOS,
-            bytearray([0x00, 0x00, (self._height - 1) & 0xFF, (self._height - 1) >> 8]),
+            bytearray([0x00, 0x00, self._height, (self._height) >> 8]),
         )
 
         # Set border waveform
         self.command(_SSD1680_WRITE_BORDER, bytearray([0x05]))
 
         # Set ram X count
-        self.command(_SSD1680_SET_RAMXCOUNT, bytearray([0x00]))
+        self.command(_SSD1680_SET_RAMXCOUNT, bytearray([0x01]))
         # Set ram Y count
-        self.command(_SSD1680_SET_RAMYCOUNT, bytearray([0x00, 0x00]))
+        self.command(_SSD1680_SET_RAMYCOUNT, bytearray([self._height, 0]))
         self.busy_wait()
 
     def update(self):

adafruit_epd/ssd1683.py

@@ -14,7 +14,6 @@
 from adafruit_epd.ssd1675 import Adafruit_SSD1675
 from adafruit_epd.ssd1680 import Adafruit_SSD1680
 from adafruit_epd.ssd1681 import Adafruit_SSD1681
-from adafruit_epd.ssd1683 import Adafruit_SSD1683
 from adafruit_epd.uc8151d import Adafruit_UC8151D
 
 # create the spi device and pins we will need
@@ -37,7 +36,6 @@
 # display = Adafruit_UC8151D(128, 296,        # 2.9" mono flexible display
 # display = Adafruit_IL0373(128, 296,         # 2.9" Tri-color display IL0373
 # display = Adafruit_SSD1680(128, 296,        # 2.9" Tri-color display SSD1680
-# display = Adafruit_SSD1683(400, 300,        # 4.2" 300x400 Tri-Color display
 # display = Adafruit_IL0398(400, 300,         # 4.2" Tri-color display
 display = Adafruit_IL0373(
     104,

examples/epd_bitmap.py

@@ -17,7 +17,6 @@
 from adafruit_epd.ssd1675b import Adafruit_SSD1675B
 from adafruit_epd.ssd1680 import Adafruit_SSD1680
 from adafruit_epd.ssd1681 import Adafruit_SSD1681
-from adafruit_epd.ssd1683 import Adafruit_SSD1683
 from adafruit_epd.uc8151d import Adafruit_UC8151D
 
 # create the spi device and pins we will need
@@ -36,7 +35,6 @@
 # display = Adafruit_SSD1680(122, 250,        # 2.13" HD Tri-color display
 # display = Adafruit_SSD1681(200, 200,        # 1.54" HD Tri-color display
 # display = Adafruit_SSD1675(122, 250,        # 2.13" HD mono display
-# display = Adafruit_SSD1683(400, 300,        # 4.2" 300x400 Tri-Color display
 # display = Adafruit_IL91874(176, 264,        # 2.7" Tri-color display
 # display = Adafruit_EK79686(176, 264,        # 2.7" Tri-color display
 # display = Adafruit_IL0373(152, 152,         # 1.54" Tri-color display

examples/epd_blinka.py

@@ -20,7 +20,6 @@
 from adafruit_epd.ssd1675 import Adafruit_SSD1675
 from adafruit_epd.ssd1680 import Adafruit_SSD1680, Adafruit_SSD1680Z
 from adafruit_epd.ssd1681 import Adafruit_SSD1681
-from adafruit_epd.ssd1683 import Adafruit_SSD1683
 from adafruit_epd.uc8151d import Adafruit_UC8151D
 
 # First define some color constants
@@ -50,7 +49,6 @@
 # display = Adafruit_SSD1680(122, 250,        # 2.13" HD Tri-color or mono display
 # display = Adafruit_SSD1680Z(122, 250,       # Newer 2.13" mono display
 # display = Adafruit_SSD1681(200, 200,        # 1.54" HD Tri-color display
-# display = Adafruit_SSD1683(400, 300,        # 4.2" 300x400 Tri-Color display
 # display = Adafruit_IL91874(176, 264,        # 2.7" Tri-color display
 # display = Adafruit_EK79686(176, 264,        # 2.7" Tri-color display
 # display = Adafruit_IL0373(152, 152,         # 1.54" Tri-color display

examples/epd_pillow_demo.py

@@ -22,7 +22,6 @@
 from adafruit_epd.ssd1675 import Adafruit_SSD1675
 from adafruit_epd.ssd1680 import Adafruit_SSD1680, Adafruit_SSD1680Z
 from adafruit_epd.ssd1681 import Adafruit_SSD1681
-from adafruit_epd.ssd1683 import Adafruit_SSD1683
 from adafruit_epd.uc8151d import Adafruit_UC8151D
 
 # create the spi device and pins we will need
@@ -40,7 +39,6 @@
 # display = Adafruit_SSD1680(122, 250,        # 2.13" HD Tri-color or mono display
 # display = Adafruit_SSD1680Z(122, 250,       # Newer 2.13" mono display
 # display = Adafruit_SSD1681(200, 200,        # 1.54" HD Tri-color display
-# display = Adafruit_SSD1683(400, 300,        # 4.2" 300x400 Tri-Color display
 # display = Adafruit_IL91874(176, 264,        # 2.7" Tri-color display
 # display = Adafruit_EK79686(176, 264,        # 2.7" Tri-color display
 # display = Adafruit_IL0373(152, 152,         # 1.54" Tri-color display

examples/epd_pillow_image.py

@@ -15,7 +15,6 @@
 from adafruit_epd.ssd1675 import Adafruit_SSD1675
 from adafruit_epd.ssd1680 import Adafruit_SSD1680, Adafruit_SSD1680Z
 from adafruit_epd.ssd1681 import Adafruit_SSD1681
-from adafruit_epd.ssd1683 import Adafruit_SSD1683
 from adafruit_epd.uc8151d import Adafruit_UC8151D
 
 # create the spi device and pins we will need
@@ -34,7 +33,6 @@
 # display = Adafruit_SSD1680(122, 250,        # 2.13" HD Tri-color display
 # display = Adafruit_SSD1681(200, 200,        # 1.54" HD Tri-color display
 # display = Adafruit_SSD1681(200, 200,        # 1.54" HD Tri-color display
-# display = Adafruit_SSD1683(400, 300,        # 4.2" 300x400 Tri-Color display
 # display = Adafruit_IL91874(176, 264,        # 2.7" Tri-color display
 # display = Adafruit_EK79686(176, 264,        # 2.7" Tri-color display
 # display = Adafruit_IL0373(152, 152,         # 1.54" Tri-color display