From 422052b97c99c4ebe1b4547b7c937c7f2ec08bd3 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Mon, 18 Sep 2023 20:57:19 +0200 Subject: [PATCH] waveshare35lcd.py: small bug fix to show face immediately Signed-off-by: Jeroen Oudshoorn --- pwnagotchi/ui/faces.py | 1 + pwnagotchi/ui/hw/waveshare35lcd.py | 4 ++-- pwnagotchi/ui/view.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pwnagotchi/ui/faces.py b/pwnagotchi/ui/faces.py index 66874d0e..963e6967 100644 --- a/pwnagotchi/ui/faces.py +++ b/pwnagotchi/ui/faces.py @@ -24,6 +24,7 @@ UPLOAD = '(1__0)' UPLOAD1 = '(1__1)' UPLOAD2 = '(0__1)' + def load_from_config(config): for face_name, face_value in config.items(): globals()[face_name.upper()] = face_value diff --git a/pwnagotchi/ui/hw/waveshare35lcd.py b/pwnagotchi/ui/hw/waveshare35lcd.py index 2769b503..91470e56 100644 --- a/pwnagotchi/ui/hw/waveshare35lcd.py +++ b/pwnagotchi/ui/hw/waveshare35lcd.py @@ -15,7 +15,7 @@ class Waveshare35lcd(DisplayImpl): fonts.setup(12, 10, 12, 70, 25, 9) self._layout['width'] = 480 self._layout['height'] = 320 - self._layout['face'] = (110, 60) + self._layout['face'] = (110, 100) self._layout['name'] = (10, 30) self._layout['channel'] = (0, 0) self._layout['aps'] = (80, 0) @@ -27,7 +27,7 @@ class Waveshare35lcd(DisplayImpl): self._layout['shakes'] = (10, 300) self._layout['mode'] = (440, 300) self._layout['status'] = { - 'pos': (80, 180), + 'pos': (80, 200), 'font': fonts.status_font(fonts.Medium), 'max': 100 } diff --git a/pwnagotchi/ui/view.py b/pwnagotchi/ui/view.py index 4d05894f..7647ca23 100644 --- a/pwnagotchi/ui/view.py +++ b/pwnagotchi/ui/view.py @@ -40,7 +40,7 @@ class View(object): self._width = self._layout['width'] self._height = self._layout['height'] self._state = State(state={ - 'channel': LabeledValue(color=BLACK, label='CH', value='00', position=self._layout['channel'], + 'channel': LabeledValue(color=BLACK, label='CH', value='000', position=self._layout['channel'], label_font=fonts.Bold, text_font=fonts.Medium), 'aps': LabeledValue(color=BLACK, label='APS', value='0 (00)', position=self._layout['aps'],