fix on 38 displays

pwnagotchi/ui/hw/libs/waveshare/lcdhat144/epd.py

@@ -12,6 +12,7 @@ from . import config
 from . import LCD_1in44
 from PIL import ImageOps
 
+
 class EPD(object):
     def __init__(self):
         self.width = 128
@@ -24,8 +25,7 @@ class EPD(object):
         pass
 
     def clear(self):
-        #self.LCD.LCD_Clear()
+        self.LCD.LCD_Clear()
-        pass
 
     def display(self, image):
         rgb_im = ImageOps.colorize(image.convert("L"), black="green", white="black")

pwnagotchi/ui/hw/waveshare13in3k.py

@@ -38,7 +38,8 @@ class Waveshare13in3k(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare1in02.py

@@ -38,7 +38,8 @@ class Waveshare1in02(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare1in54.py

@@ -39,7 +39,7 @@ class Waveshare154(DisplayImpl):
 
     def render(self, canvas):
         buf = self._display.getbuffer(canvas)
-        self._display.display(buf, None)
+        self._display.display(buf)
 
     def clear(self):
         # pass

pwnagotchi/ui/hw/waveshare1in54_V2.py

@@ -39,7 +39,7 @@ class Waveshare154V2(DisplayImpl):
 
     def render(self, canvas):
         buf = self._display.getbuffer(canvas)
-        self._display.display(buf, None)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare1in54c.py

@@ -38,7 +38,8 @@ class Waveshare1in54c(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare1in64g.py

@@ -38,7 +38,8 @@ class Waveshare1in64g(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare2in36g.py

@@ -38,7 +38,8 @@ class Waveshare2in36g(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare2in66.py

@@ -34,11 +34,12 @@ class Waveshare2in66(DisplayImpl):
         logging.info("initializing waveshare 2.66 inch lcd display")
         from pwnagotchi.ui.hw.libs.waveshare.v2in66.epd2in66 import EPD
         self._display = EPD()
-        self._display.init(0)
+        self._display.init(1)
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare2in66g.py

@@ -38,7 +38,8 @@ class Waveshare2in66g(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare2in7b.py

@@ -39,7 +39,7 @@ class Waveshare27b(DisplayImpl):
 
     def render(self, canvas):
         buf = self._display.getbuffer(canvas)
-        self._display.display(buf)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear(0xff)

pwnagotchi/ui/hw/waveshare2in7b_V2.py

@@ -39,7 +39,7 @@ class Waveshare27bV2(DisplayImpl):
 
     def render(self, canvas):
         buf = self._display.getbuffer(canvas)
-        self._display.display(buf)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear(0xff)

pwnagotchi/ui/hw/waveshare2in9b_V3.py

@@ -35,12 +35,12 @@ class Waveshare29bV3(DisplayImpl):
         from pwnagotchi.ui.hw.libs.waveshare.v2in9b_v3.epd2in9b_V3 import EPD
         self._display = EPD()
         self._display.init()
-        self._display.Clear(0xFF)
+        self._display.Clear()
         self._display.init()
 
     def render(self, canvas):
         buf = self._display.getbuffer(canvas)
-        self._display.display(buf)
+        self._display.display(buf, None)
 
     def clear(self):
-        self._display.Clear(0xFF)
+        self._display.Clear()

pwnagotchi/ui/hw/waveshare2in9b_V4.py

@@ -35,12 +35,12 @@ class Waveshare29bV4(DisplayImpl):
         from pwnagotchi.ui.hw.libs.waveshare.v2in9b_v4.epd2in9b_V4 import EPD
         self._display = EPD()
         self._display.init()
-        self._display.Clear(0xFF)
+        self._display.Clear()
         self._display.init()
 
     def render(self, canvas):
         buf = self._display.getbuffer(canvas)
-        self._display.display(buf)
+        self._display.display(buf, None)
 
     def clear(self):
-        self._display.Clear(0xFF)
+        self._display.Clear()

pwnagotchi/ui/hw/waveshare2in9bc.py

@@ -38,7 +38,8 @@ class Waveshare2in9bc(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare2in9d.py

@@ -38,7 +38,8 @@ class Waveshare2in9d(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare3in0g.py

@@ -10,8 +10,8 @@ class Waveshare3in0g(DisplayImpl):
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)
-        self._layout['width'] = 400
+        self._layout['width'] = 168
-        self._layout['height'] = 168
+        self._layout['height'] = 400
         self._layout['face'] = (0, 43)
         self._layout['name'] = (0, 14)
         self._layout['channel'] = (0, 0)
@@ -38,7 +38,8 @@ class Waveshare3in0g(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare3in7.py

@@ -9,24 +9,24 @@ class Waveshare3in7(DisplayImpl):
         super(Waveshare3in7, self).__init__(config, 'waveshare3in7')
 
     def layout(self):
-        fonts.setup(20, 19, 20, 45, 35, 19)
+        fonts.setup(10, 8, 10, 18, 25, 9)
-        self._layout['width'] = 480
+        self._layout['width'] = 280
-        self._layout['height'] = 280
+        self._layout['height'] = 480
-        self._layout['face'] = (0, 75)
+        self._layout['face'] = (0, 43)
-        self._layout['name'] = (5, 35)
+        self._layout['name'] = (0, 14)
         self._layout['channel'] = (0, 0)
-        self._layout['aps'] = (65, 0)
+        self._layout['aps'] = (0, 71)
-        self._layout['uptime'] = (355, 0)
+        self._layout['uptime'] = (0, 25)
-        self._layout['line1'] = [0, 25, 480, 25]
+        self._layout['line1'] = [0, 12, 280, 12]
-        self._layout['line2'] = [0, 255, 480, 255]
+        self._layout['line2'] = [0, 116, 280, 116]
-        self._layout['friend_face'] = (0, 146)
+        self._layout['friend_face'] = (12, 88)
-        self._layout['friend_name'] = (40, 146)
+        self._layout['friend_name'] = (1, 103)
-        self._layout['shakes'] = (0, 258)
+        self._layout['shakes'] = (26, 117)
-        self._layout['mode'] = (430, 258)
+        self._layout['mode'] = (0, 117)
         self._layout['status'] = {
-            'pos': (225, 35),
+            'pos': (65, 26),
-            'font': fonts.status_font(fonts.Medium),
+            'font': fonts.status_font(fonts.Small),
-            'max': 21
+            'max': 12
         }
         return self._layout
 
@@ -35,12 +35,11 @@ class Waveshare3in7(DisplayImpl):
         from pwnagotchi.ui.hw.libs.waveshare.v3in7.epd3in7 import EPD
         self._display = EPD()
         self._display.init(0)
-        self._display.Clear(0xFF)
+        self._display.Clear(0)
-        self._display.init(1)  # 1Gray mode
 
     def render(self, canvas):
         buf = self._display.getbuffer(canvas)
-        self._display.display_1Gray(buf)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear(0)

pwnagotchi/ui/hw/waveshare4in01f.py

@@ -38,7 +38,8 @@ class Waveshare4in01f(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare4in2.py

@@ -38,7 +38,8 @@ class Waveshare4in2(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare4in26.py

@@ -38,7 +38,8 @@ class Waveshare4in26(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare4in2_V2.py

@@ -38,7 +38,8 @@ class Waveshare4in2V2(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare4in2b_V2.py

@@ -38,7 +38,8 @@ class Waveshare4in2bV2(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare4in2bc.py

@@ -38,7 +38,8 @@ class Waveshare4in2bc(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare4in37g.py

@@ -38,7 +38,8 @@ class Waveshare4in37g(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare5in65f.py

@@ -38,7 +38,8 @@ class Waveshare5in65f(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare5in83.py

@@ -38,7 +38,8 @@ class Waveshare5in83(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare5in83_V2.py

@@ -38,7 +38,8 @@ class Waveshare5in83V2(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare5in83b_V2.py

@@ -38,7 +38,8 @@ class Waveshare5in83bV2(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare5in83bc.py

@@ -38,7 +38,8 @@ class Waveshare5in83bc(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare7in3f.py

@@ -38,7 +38,8 @@ class Waveshare7in3f(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare7in3g.py

@@ -38,7 +38,8 @@ class Waveshare7in3g(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare7in5.py

@@ -38,7 +38,8 @@ class Waveshare7in5(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare7in5_HD.py

@@ -38,7 +38,8 @@ class Waveshare7in5HD(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare7in5_V2.py

@@ -51,7 +51,8 @@ class Waveshare7in5V2(DisplayImpl):
             self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare7in5b_HD.py

@@ -38,7 +38,8 @@ class Waveshare7in5bHD(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare7in5b_V2.py

@@ -38,7 +38,8 @@ class Waveshare7in5bV2(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()

pwnagotchi/ui/hw/waveshare7in5bc.py

@@ -38,7 +38,8 @@ class Waveshare7in5bc(DisplayImpl):
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
 
     def clear(self):
         self._display.Clear()