Skip to content

Commit f064871

Browse files
BlitzCityDIYBlitzCityDIY
committed
Revert "Merge branch 'ssd1883' into UC8197"
This reverts commit c69536e, reversing changes made to 6b19e3e.
1 parent c69536e commit f064871

File tree

7 files changed

+5
-277
lines changed

7 files changed

+5
-277
lines changed

‎adafruit_epd/ssd1680.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ def power_up(self):
242242

243243
self.command(
244244
_SSD1680_DRIVER_CONTROL,
245-
bytearray([self._height & 0xFF, (self._height) >> 8, 0x00]),
245+
bytearray([self._height, (self._height) >> 8, 0x00]),
246246
)
247247
self.command(_SSD1680_DATA_MODE, bytearray([0x03]))
248248

@@ -251,19 +251,19 @@ def power_up(self):
251251
self.command(_SSD1680_GATE_VOLTAGE, bytearray([0x17]))
252252
self.command(_SSD1680_SOURCE_VOLTAGE, bytearray([0x41, 0x00, 0x32]))
253253

254-
self.command(_SSD1680_SET_RAMXPOS, bytearray([0x00, (self._width // 8) - 1]))
254+
self.command(_SSD1680_SET_RAMXPOS, bytearray([0x00, (self._width // 8)]))
255255
self.command(
256256
_SSD1680_SET_RAMYPOS,
257-
bytearray([0x00, 0x00, (self._height - 1) & 0xFF, (self._height - 1) >> 8]),
257+
bytearray([0x00, 0x00, self._height, (self._height) >> 8]),
258258
)
259259

260260
# Set border waveform
261261
self.command(_SSD1680_WRITE_BORDER, bytearray([0x05]))
262262

263263
# Set ram X count
264-
self.command(_SSD1680_SET_RAMXCOUNT, bytearray([0x00]))
264+
self.command(_SSD1680_SET_RAMXCOUNT, bytearray([0x01]))
265265
# Set ram Y count
266-
self.command(_SSD1680_SET_RAMYCOUNT, bytearray([0x00, 0x00]))
266+
self.command(_SSD1680_SET_RAMYCOUNT, bytearray([self._height, 0]))
267267
self.busy_wait()
268268

269269
def update(self):

‎adafruit_epd/ssd1683.py‎

Lines changed: 0 additions & 262 deletions
This file was deleted.

‎examples/epd_bitmap.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from adafruit_epd.ssd1675 import Adafruit_SSD1675
1515
from adafruit_epd.ssd1680 import Adafruit_SSD1680
1616
from adafruit_epd.ssd1681 import Adafruit_SSD1681
17-
from adafruit_epd.ssd1683 import Adafruit_SSD1683
1817
from adafruit_epd.uc8151d import Adafruit_UC8151D
1918

2019
# create the spi device and pins we will need
@@ -37,7 +36,6 @@
3736
# display = Adafruit_UC8151D(128, 296, # 2.9" mono flexible display
3837
# display = Adafruit_IL0373(128, 296, # 2.9" Tri-color display IL0373
3938
# display = Adafruit_SSD1680(128, 296, # 2.9" Tri-color display SSD1680
40-
# display = Adafruit_SSD1683(400, 300, # 4.2" 300x400 Tri-Color display
4139
# display = Adafruit_IL0398(400, 300, # 4.2" Tri-color display
4240
display = Adafruit_IL0373(
4341
104,

‎examples/epd_blinka.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from adafruit_epd.ssd1675b import Adafruit_SSD1675B
1818
from adafruit_epd.ssd1680 import Adafruit_SSD1680
1919
from adafruit_epd.ssd1681 import Adafruit_SSD1681
20-
from adafruit_epd.ssd1683 import Adafruit_SSD1683
2120
from adafruit_epd.uc8151d import Adafruit_UC8151D
2221

2322
# create the spi device and pins we will need
@@ -36,7 +35,6 @@
3635
# display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color display
3736
# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display
3837
# display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display
39-
# display = Adafruit_SSD1683(400, 300, # 4.2" 300x400 Tri-Color display
4038
# display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display
4139
# display = Adafruit_EK79686(176, 264, # 2.7" Tri-color display
4240
# display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display

‎examples/epd_pillow_demo.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from adafruit_epd.ssd1675 import Adafruit_SSD1675
2121
from adafruit_epd.ssd1680 import Adafruit_SSD1680, Adafruit_SSD1680Z
2222
from adafruit_epd.ssd1681 import Adafruit_SSD1681
23-
from adafruit_epd.ssd1683 import Adafruit_SSD1683
2423
from adafruit_epd.uc8151d import Adafruit_UC8151D
2524

2625
# First define some color constants
@@ -50,7 +49,6 @@
5049
# display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color or mono display
5150
# display = Adafruit_SSD1680Z(122, 250, # Newer 2.13" mono display
5251
# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display
53-
# display = Adafruit_SSD1683(400, 300, # 4.2" 300x400 Tri-Color display
5452
# display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display
5553
# display = Adafruit_EK79686(176, 264, # 2.7" Tri-color display
5654
# display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display

‎examples/epd_pillow_image.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from adafruit_epd.ssd1675 import Adafruit_SSD1675
2323
from adafruit_epd.ssd1680 import Adafruit_SSD1680, Adafruit_SSD1680Z
2424
from adafruit_epd.ssd1681 import Adafruit_SSD1681
25-
from adafruit_epd.ssd1683 import Adafruit_SSD1683
2625
from adafruit_epd.uc8151d import Adafruit_UC8151D
2726

2827
# create the spi device and pins we will need
@@ -40,7 +39,6 @@
4039
# display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color or mono display
4140
# display = Adafruit_SSD1680Z(122, 250, # Newer 2.13" mono display
4241
# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display
43-
# display = Adafruit_SSD1683(400, 300, # 4.2" 300x400 Tri-Color display
4442
# display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display
4543
# display = Adafruit_EK79686(176, 264, # 2.7" Tri-color display
4644
# display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display

‎examples/epd_simpletest.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from adafruit_epd.ssd1675 import Adafruit_SSD1675
1616
from adafruit_epd.ssd1680 import Adafruit_SSD1680, Adafruit_SSD1680Z
1717
from adafruit_epd.ssd1681 import Adafruit_SSD1681
18-
from adafruit_epd.ssd1683 import Adafruit_SSD1683
1918
from adafruit_epd.uc8151d import Adafruit_UC8151D
2019

2120
# create the spi device and pins we will need
@@ -34,7 +33,6 @@
3433
# display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color display
3534
# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display
3635
# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display
37-
# display = Adafruit_SSD1683(400, 300, # 4.2" 300x400 Tri-Color display
3836
# display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display
3937
# display = Adafruit_EK79686(176, 264, # 2.7" Tri-color display
4038
# display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display

0 commit comments

Comments
 (0)