remove color = black

This commit is contained in:
jayofelony
2024-03-04 15:55:50 +01:00
parent 77af772b4b
commit 2149c5dbdf
3 changed files with 46 additions and 112 deletions

View File

@ -31,38 +31,16 @@ class WaveshareV1(DisplayImpl):
return self._layout return self._layout
def initialize(self): def initialize(self):
if self.config['color'] == 'black':
logging.info("initializing waveshare v2in13_V1 display in monochromatic mode") logging.info("initializing waveshare v2in13_V1 display in monochromatic mode")
from pwnagotchi.ui.hw.libs.waveshare.v2in13_V1.epd2in13 import EPD from pwnagotchi.ui.hw.libs.waveshare.v2in13_V1.epd2in13 import EPD
self._display = EPD() self._display = EPD()
self._display.init(self._display.lut_full_update) self._display.init(self._display.lut_full_update)
self._display.Clear(0xFF) self._display.Clear(0xFF)
self._display.init(self._display.lut_partial_update) self._display.init(self._display.lut_partial_update)
elif self.config['color'] == 'fastAndFurious':
logging.info("initializing waveshare v2in13_V1 3-color display in FAST MODE")
logging.info("THIS MAY BE POTENTIALLY DANGEROUS. NO WARRANTY IS PROVIDED")
logging.info("USE THIS DISPLAY IN THIS MODE AT YOUR OWN RISK")
from pwnagotchi.ui.hw.libs.waveshare.v2in13_V1.epd2in13bcFAST import EPD
self._display = EPD()
self._display.init()
self._display.Clear()
else:
logging.info("initializing waveshare v2in13_V1 display 3-color mode")
from pwnagotchi.ui.hw.libs.waveshare.v2in13_V1.epd2in13bc import EPD
self._display = EPD()
self._display.init()
self._display.Clear()
def render(self, canvas): def render(self, canvas):
if self.config['color'] == 'black':
buf = self._display.getbuffer(canvas) buf = self._display.getbuffer(canvas)
self._display.display(buf) self._display.display(buf)
elif self.config['color'] == 'fastAndFurious':
buf_black = self._display.getbuffer(canvas)
self._display.DisplayPartial(buf_black)
else:
buf_black = self._display.getbuffer(canvas)
self._display.displayBlack(buf_black)
def clear(self): def clear(self):
self._display.Clear(0xff) self._display.Clear(0xff)

View File

@ -10,7 +10,6 @@ class Waveshare2in13bV3(DisplayImpl):
super(Waveshare2in13bV3, self).__init__(config, 'waveshare2in13b_v3') super(Waveshare2in13bV3, self).__init__(config, 'waveshare2in13b_v3')
def layout(self): def layout(self):
if self.config['color'] == 'black':
fonts.setup(10, 9, 10, 35, 25, 9) fonts.setup(10, 9, 10, 35, 25, 9)
self._layout['width'] = 250 self._layout['width'] = 250
self._layout['height'] = 122 self._layout['height'] = 122
@ -30,27 +29,6 @@ class Waveshare2in13bV3(DisplayImpl):
'font': fonts.status_font(fonts.Medium), 'font': fonts.status_font(fonts.Medium),
'max': 20 'max': 20
} }
else:
fonts.setup(10, 8, 10, 25, 25, 9)
self._layout['width'] = 212
self._layout['height'] = 104
self._layout['face'] = (0, 26)
self._layout['name'] = (5, 15)
self._layout['channel'] = (0, 0)
self._layout['aps'] = (28, 0)
self._layout['status'] = (91, 15)
self._layout['uptime'] = (147, 0)
self._layout['line1'] = [0, 12, 212, 12]
self._layout['line2'] = [0, 92, 212, 92]
self._layout['friend_face'] = (0, 76)
self._layout['friend_name'] = (40, 78)
self._layout['shakes'] = (0, 93)
self._layout['mode'] = (187, 93)
self._layout['status'] = {
'pos': (125, 20),
'font': fonts.status_font(fonts.Medium),
'max': 14
}
return self._layout return self._layout
def initialize(self): def initialize(self):

View File

@ -10,7 +10,6 @@ class Waveshare213bV4(DisplayImpl):
super(Waveshare213bV4, self).__init__(config, 'waveshare2in13b_v4') super(Waveshare213bV4, self).__init__(config, 'waveshare2in13b_v4')
def layout(self): def layout(self):
if self.config['color'] == 'black':
fonts.setup(10, 9, 10, 35, 25, 9) fonts.setup(10, 9, 10, 35, 25, 9)
self._layout['width'] = 250 self._layout['width'] = 250
self._layout['height'] = 122 self._layout['height'] = 122
@ -30,27 +29,6 @@ class Waveshare213bV4(DisplayImpl):
'font': fonts.status_font(fonts.Medium), 'font': fonts.status_font(fonts.Medium),
'max': 20 'max': 20
} }
else:
fonts.setup(10, 8, 10, 25, 25, 9)
self._layout['width'] = 212
self._layout['height'] = 104
self._layout['face'] = (0, 26)
self._layout['name'] = (5, 15)
self._layout['channel'] = (0, 0)
self._layout['aps'] = (28, 0)
self._layout['status'] = (91, 15)
self._layout['uptime'] = (147, 0)
self._layout['line1'] = [0, 12, 212, 12]
self._layout['line2'] = [0, 92, 212, 92]
self._layout['friend_face'] = (0, 76)
self._layout['friend_name'] = (40, 78)
self._layout['shakes'] = (0, 93)
self._layout['mode'] = (187, 93)
self._layout['status'] = {
'pos': (125, 20),
'font': fonts.status_font(fonts.Medium),
'max': 14
}
return self._layout return self._layout
def initialize(self): def initialize(self):