From 9cc15403c3db6f7f572f41f390726664ad18222f Mon Sep 17 00:00:00 2001 From: Jeremy O'Brien Date: Wed, 6 Nov 2019 09:05:34 -0500 Subject: [PATCH] normalize the waveshare29inch config string Signed-off-by: Jeremy O'Brien --- pwnagotchi/defaults.yml | 2 +- pwnagotchi/utils.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pwnagotchi/defaults.yml b/pwnagotchi/defaults.yml index 688b4166..25512318 100644 --- a/pwnagotchi/defaults.yml +++ b/pwnagotchi/defaults.yml @@ -230,7 +230,7 @@ ui: display: enabled: true rotation: 180 - # Possible options inkyphat/inky, papirus/papi, waveshare_1/ws_1 or waveshare_2/ws_2, oledhat, lcdhat, waveshare154inch, waveshare27inch, dfrobot/df + # Possible options inkyphat/inky, papirus/papi, waveshare_1/ws_1 or waveshare_2/ws_2, oledhat, lcdhat, waveshare154inch, waveshare27inch, waveshare29inch, dfrobot/df type: 'waveshare_2' # Possible options red/yellow/black (black used for monocromatic displays) # Waveshare tri-color 2.13in display can be over-driven with color set as 'fastAndFurious' diff --git a/pwnagotchi/utils.py b/pwnagotchi/utils.py index 4fa15d3b..4687f3e1 100644 --- a/pwnagotchi/utils.py +++ b/pwnagotchi/utils.py @@ -95,6 +95,9 @@ def load_config(args): elif config['ui']['display']['type'] in ('ws_27inch', 'ws27inch', 'waveshare_27inch', 'waveshare27inch'): config['ui']['display']['type'] = 'waveshare27inch' + elif config['ui']['display']['type'] in ('ws_29inch', 'ws29inch', 'waveshare_29inch', 'waveshare29inch'): + config['ui']['display']['type'] = 'waveshare29inch' + elif config['ui']['display']['type'] in ('lcdhat',): config['ui']['display']['type'] = 'lcdhat'