mirror of
https://github.com/jayofelony/pwnagotchi.git
synced 2025-07-01 18:37:27 -04:00
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # Makefile # pwnagotchi/plugins/default/hashie.py
This commit is contained in:
jayofelony
@ -238,14 +238,60 @@ def load_config(args):
|
||||
config = merge_config(additional_config, config)
|
||||
|
||||
# the very first step is to normalize the display name, so we don't need dozens of if/elif around
|
||||
# NON E-INK DISPLAYS---------------------------------------------------------------
|
||||
if config['ui']['display']['type'] in ('inky', 'inkyphat'):
|
||||
config['ui']['display']['type'] = 'inky'
|
||||
|
||||
elif config['ui']['display']['type'] in ('papirus', 'papi'):
|
||||
config['ui']['display']['type'] = 'papirus'
|
||||
|
||||
elif config['ui']['display']['type'] in 'oledhat':
|
||||
config['ui']['display']['type'] = 'oledhat'
|
||||
|
||||
elif config['ui']['display']['type'] in 'lcdhat':
|
||||
config['ui']['display']['type'] = 'lcdhat'
|
||||
|
||||
elif config['ui']['display']['type'] in ('dfrobot_1', 'df1'):
|
||||
config['ui']['display']['type'] = 'dfrobot_1'
|
||||
|
||||
elif config['ui']['display']['type'] in ('dfrobot_2', 'df2'):
|
||||
config['ui']['display']['type'] = 'dfrobot_2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('waveshare144lcd', 'ws_144', 'ws144', 'waveshare_144', 'waveshare144'):
|
||||
config['ui']['display']['type'] = 'waveshare144lcd'
|
||||
|
||||
elif config['ui']['display']['type'] in ('spotpear24inch'):
|
||||
config['ui']['display']['type'] = 'spotpear24inch'
|
||||
|
||||
elif config['ui']['display']['type'] in ('displayhatmini'):
|
||||
config['ui']['display']['type'] = 'displayhatmini'
|
||||
|
||||
elif config['ui']['display']['type'] in ('waveshare35lcd'):
|
||||
config['ui']['display']['type'] = 'waveshare35lcd'
|
||||
|
||||
# E-INK DISPLAYS ------------------------------------------------------------------------
|
||||
|
||||
elif config['ui']['display']['type'] in ('waveshare1in02', 'ws1in02', 'ws102', 'waveshare_102', 'waveshare_1in02'):
|
||||
config['ui']['display']['type'] = 'waveshare1in02'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_154inch', 'waveshare1in54', 'ws154inch', 'waveshare_154', 'waveshare154'):
|
||||
config['ui']['display']['type'] = 'waveshare1in54'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_154inchb', 'waveshare1in54b', 'ws154inchb', 'waveshare_154b', 'waveshare154b'):
|
||||
config['ui']['display']['type'] = 'waveshare1in54b'
|
||||
|
||||
elif config['ui']['display']['type'] in ('waveshare1in54c', 'ws1in54c', 'ws154c', 'waveshare_154c', 'waveshare_1in54c'):
|
||||
config['ui']['display']['type'] = 'waveshare1in54c'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_154inchbv2', 'waveshare1in54bv2', 'waveshare1in54b_v2', 'ws154inchbv2', 'waveshare_154bv2', 'waveshare154bv2'):
|
||||
config['ui']['display']['type'] = 'waveshare1in54b_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_154inchv2', 'waveshare1in54v2', 'ws154inchv2', 'waveshare_154inchv2', 'waveshare154v2', "waveshare1in54_v2"):
|
||||
config['ui']['display']['type'] = 'waveshare1in54_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('waveshare1in64g', 'ws1in64g', 'ws164g', 'waveshare_164g', 'waveshare_1in64g'):
|
||||
config['ui']['display']['type'] = 'waveshare1in64g'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_1', 'ws1', 'waveshare_1', 'waveshare1'):
|
||||
config['ui']['display']['type'] = 'waveshare_1'
|
||||
|
||||
@ -258,50 +304,14 @@ def load_config(args):
|
||||
elif config['ui']['display']['type'] in ('ws_4', 'ws4', 'waveshare_4', 'waveshare4'):
|
||||
config['ui']['display']['type'] = 'waveshare_4'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_27inch', 'ws27inch', 'waveshare2in7', 'waveshare_27inch', 'waveshare27inch'):
|
||||
config['ui']['display']['type'] = 'waveshare2in7'
|
||||
elif config['ui']['display']['type'] in ('waveshare2in13b_v3', 'waveshare2in13b_v3', 'ws213bv3', 'waveshare_213bv3', 'waveshare213inb_v3'):
|
||||
config['ui']['display']['type'] = 'waveshare2in13b_v3'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_27inchv2', 'waveshare2in7_v2', 'ws27inchv2', 'waveshare_27inchv2', 'waveshare27inchv2'):
|
||||
config['ui']['display']['type'] = 'waveshare2in7_v2'
|
||||
elif config['ui']['display']['type'] in ('ws_213bv4', 'waveshare2in13b_v4', 'ws213bv4', 'waveshare_213bv4', 'waveshare213inb_v4'):
|
||||
config['ui']['display']['type'] = 'waveshare2in13b_v4'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_27inchbv2', 'waveshare2in7b_v2', 'ws27inchbv2', 'waveshare_27inchbv2', 'waveshare27inchbv2'):
|
||||
config['ui']['display']['type'] = 'waveshare2in7b_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_29inch', 'waveshare2in9', 'ws29inch', 'waveshare_29inch', 'waveshare29inch'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_29inchv2', 'waveshare2in9_v2', 'ws29inchv2', 'waveshare_29inchv2', 'waveshare29inchv2'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_29inchbv3', 'waveshare2in9b_v3', 'ws29inchbv3', 'waveshare_29inchbv3', 'waveshare29inchbv3'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9b_v3'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_29inchbv4', 'waveshare2in9b_v4', 'ws29inchbv4', 'waveshare_29inchbv4', 'waveshare29inchbv4'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9b_v4'
|
||||
|
||||
elif config['ui']['display']['type'] in 'lcdhat':
|
||||
config['ui']['display']['type'] = 'lcdhat'
|
||||
|
||||
elif config['ui']['display']['type'] in ('dfrobot_1', 'df1'):
|
||||
config['ui']['display']['type'] = 'dfrobot_1'
|
||||
|
||||
elif config['ui']['display']['type'] in ('dfrobot_2', 'df2'):
|
||||
config['ui']['display']['type'] = 'dfrobot_2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_154inch', 'waveshare1in54', 'ws154inch', 'waveshare_154inch', 'waveshare154inch'):
|
||||
config['ui']['display']['type'] = 'waveshare1in54'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_154inchb', 'waveshare1in54b', 'ws154inchb', 'waveshare_154inchb', 'waveshare154inchb'):
|
||||
config['ui']['display']['type'] = 'waveshare1in54b'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_154inchbv2', 'waveshare1in54bv2', 'ws154inchbv2', 'waveshare_154inchbv2', 'waveshare154inchbv2'):
|
||||
config['ui']['display']['type'] = 'waveshare1in54b_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_154inchv2', 'waveshare1in54v2', 'ws154inchv2', 'waveshare_154inchv2', 'waveshare154inchv2'):
|
||||
config['ui']['display']['type'] = 'waveshare1in54_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('waveshare144lcd', 'ws_144inch', 'ws144inch', 'waveshare_144inch', 'waveshare144inch'):
|
||||
config['ui']['display']['type'] = 'waveshare144lcd'
|
||||
elif config['ui']['display']['type'] in ('ws_213bc', 'ws213bc', 'waveshare2in13bc', 'waveshare_213bc', 'waveshare213bc'):
|
||||
config['ui']['display']['type'] = 'waveshare2in13bc'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_213d', 'ws213d', 'waveshare2in13d', 'waveshare_213d', 'waveshare213d'):
|
||||
config['ui']['display']['type'] = 'waveshare2in13d'
|
||||
@ -309,123 +319,121 @@ def load_config(args):
|
||||
elif config['ui']['display']['type'] in ('ws_213g', 'waveshare2in13g', 'waveshare213g', 'ws213g', 'waveshare_213g'):
|
||||
config['ui']['display']['type'] = 'waveshare2in13g'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_213bc', 'ws213bc', 'waveshare2in13bc', 'waveshare_213bc', 'waveshare213bc'):
|
||||
config['ui']['display']['type'] = 'waveshare2in13bc'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_213bv4', 'waveshare2in13b_v4', 'ws213bv4', 'waveshare_213bv4', 'waveshare213inb_v4'):
|
||||
config['ui']['display']['type'] = 'waveshare2in13b_v4'
|
||||
|
||||
elif config['ui']['display']['type'] in 'spotpear24inch':
|
||||
config['ui']['display']['type'] = 'spotpear24inch'
|
||||
|
||||
elif config['ui']['display']['type'] in 'displayhatmini':
|
||||
config['ui']['display']['type'] = 'displayhatmini'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare35lcd':
|
||||
config['ui']['display']['type'] = 'waveshare35lcd'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare1in54c':
|
||||
config['ui']['display']['type'] = 'waveshare1in54c'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare1in64g':
|
||||
config['ui']['display']['type'] = 'waveshare1in64g'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare1in02':
|
||||
config['ui']['display']['type'] = 'waveshare1in02'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare2in9bc':
|
||||
config['ui']['display']['type'] = 'waveshare2in9bc'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare2in9d':
|
||||
config['ui']['display']['type'] = 'waveshare2in9d'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare2in13b_v3':
|
||||
config['ui']['display']['type'] = 'waveshare2in13b_v3'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare2in36g':
|
||||
elif config['ui']['display']['type'] in ('ws_2in36g', 'waveshare2in36g', 'waveshare236g', 'ws236g', 'waveshare_236g'):
|
||||
config['ui']['display']['type'] = 'waveshare2in36g'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare2in66':
|
||||
elif config['ui']['display']['type'] in ('ws_2in66', 'waveshare2in66', 'waveshare266', 'ws266', 'waveshare_266'):
|
||||
config['ui']['display']['type'] = 'waveshare2in66'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare2in66b':
|
||||
elif config['ui']['display']['type'] in ('ws_2in66b', 'waveshare2in66b', 'waveshare266b', 'ws266b', 'waveshare_266b'):
|
||||
config['ui']['display']['type'] = 'waveshare2in66b'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare2in66g':
|
||||
elif config['ui']['display']['type'] in ('ws_2in66g', 'waveshare2in66g', 'waveshare266g', 'ws266g', 'waveshare_266g'):
|
||||
config['ui']['display']['type'] = 'waveshare2in66g'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare3in0g':
|
||||
elif config['ui']['display']['type'] in ('ws_27inch', 'ws27inch', 'waveshare2in7', 'waveshare_27inch', 'waveshare27'):
|
||||
config['ui']['display']['type'] = 'waveshare2in7'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_2in7v2', 'waveshare2in7_v2', 'waveshare2in7v2', 'ws27inchv2', 'waveshare_27v2', 'waveshare27v2'):
|
||||
config['ui']['display']['type'] = 'waveshare2in7_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_2in7bv2', 'waveshare2in7b_v2', 'waveshare2in7bv2', 'ws27inchbv2', 'waveshare_27bv2', 'waveshare27bv2'):
|
||||
config['ui']['display']['type'] = 'waveshare2in7b_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_2in9', 'waveshare2in9', 'ws29inch', 'waveshare_29inch', 'waveshare29inch'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_2in9bc', 'waveshare2in9bc', 'ws2in9bc', 'ws29bc', 'waveshare_29bc', 'waveshare_2in9bc'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9bc'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_2in9d', 'waveshare2in9d', 'ws2in9d', 'ws29d', 'waveshare_29d', 'waveshare_2in9d'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9d'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_2in9v2', 'waveshare2in9_v2', 'waveshare2in9v2', 'ws2in9v2', 'waveshare_29v2', 'waveshare29v2'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_2in9bv3', 'waveshare2in9b_v3', 'waveshare2in9bv3', 'ws2in9bv3', 'waveshare_29bv3', 'waveshare29bv3'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9b_v3'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_2in9bv4', 'waveshare2in9b_v4', 'waveshare2in9bv4', 'ws2in9bv4', 'waveshare_29bv4', 'waveshare29bv4'):
|
||||
config['ui']['display']['type'] = 'waveshare2in9b_v4'
|
||||
|
||||
elif config['ui']['display']['type'] in ('ws_3in0g', 'waveshare3in0g', 'ws3in0g', 'waveshare_30g', 'waveshare30g'):
|
||||
config['ui']['display']['type'] = 'waveshare3in0g'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare3in7':
|
||||
elif config['ui']['display']['type'] in ('ws_3in7', 'waveshare3in7', 'ws3in7', 'waveshare_37', 'waveshare37'):
|
||||
config['ui']['display']['type'] = 'waveshare3in7'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare3in52':
|
||||
elif config['ui']['display']['type'] in ('ws_3in52', 'waveshare3in52', 'ws3in52', 'waveshare_352', 'waveshare352'):
|
||||
config['ui']['display']['type'] = 'waveshare3in52'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare4in01f':
|
||||
elif config['ui']['display']['type'] in ('ws_4in01f', 'waveshare4in01f', 'ws4in01f', 'waveshare_401f', 'waveshare401f'):
|
||||
config['ui']['display']['type'] = 'waveshare4in01f'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare4in2':
|
||||
elif config['ui']['display']['type'] in ('ws_4in2', 'waveshare4in2', 'ws4in2', 'waveshare_42', 'waveshare42'):
|
||||
config['ui']['display']['type'] = 'waveshare4in2'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare4in2_v2':
|
||||
elif config['ui']['display']['type'] in ('ws_4in2v2', 'waveshare4in2v2', 'ws4in2v2', 'waveshare_42v2', 'waveshare42v2'):
|
||||
config['ui']['display']['type'] = 'waveshare4in2_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare4in2b_v2':
|
||||
elif config['ui']['display']['type'] in ('ws_4in2bv2', 'waveshare4in2bv2', 'ws4in2bv2', 'waveshare_42bv2', 'waveshare42bv2'):
|
||||
config['ui']['display']['type'] = 'waveshare4in2b_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare4in2bc':
|
||||
elif config['ui']['display']['type'] in ('ws_4in2bc', 'waveshare4in2bc', 'ws4in2bc', 'waveshare_42bc', 'waveshare42bc'):
|
||||
config['ui']['display']['type'] = 'waveshare4in2bc'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare4in26':
|
||||
elif config['ui']['display']['type'] in ('ws_4in26', 'waveshare4in26', 'ws4in26', 'waveshare_426', 'waveshare426'):
|
||||
config['ui']['display']['type'] = 'waveshare4in26'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare4in37g':
|
||||
elif config['ui']['display']['type'] in ('ws_4in37g', 'waveshare4in37g', 'ws4in37g', 'waveshare_37g', 'waveshare437g'):
|
||||
config['ui']['display']['type'] = 'waveshare4in37g'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare5in65f':
|
||||
elif config['ui']['display']['type'] in ('ws_5in65f', 'waveshare5in65f', 'ws5in65f', 'waveshare_565f', 'waveshare565f'):
|
||||
config['ui']['display']['type'] = 'waveshare5in65f'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare5in83':
|
||||
elif config['ui']['display']['type'] in ('ws_5in83', 'waveshare5in83', 'ws5in83', 'waveshare_583', 'waveshare583'):
|
||||
config['ui']['display']['type'] = 'waveshare5in83'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare5in83_v2':
|
||||
elif config['ui']['display']['type'] in ('ws_5in83v2', 'waveshare5in83v2', 'ws5in83v2', 'waveshare_583v2', 'waveshare583v2'):
|
||||
config['ui']['display']['type'] = 'waveshare5in83_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare5in83b_v2':
|
||||
elif config['ui']['display']['type'] in ('ws_5in83bv2', 'waveshare5in83bv2', 'ws5in83bv2', 'waveshare_583bv2', 'waveshare583bv2'):
|
||||
config['ui']['display']['type'] = 'waveshare5in83b_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare5in83bc':
|
||||
elif config['ui']['display']['type'] in ('ws_5in83bc', 'waveshare5in83bc', 'ws5in83bc', 'waveshare_583bc', 'waveshare583bc'):
|
||||
config['ui']['display']['type'] = 'waveshare5in83bc'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare7in3f':
|
||||
elif config['ui']['display']['type'] in ('ws_7in3f', 'waveshare7in3f', 'ws7in3f', 'waveshare_73f', 'waveshare73f'):
|
||||
config['ui']['display']['type'] = 'waveshare7in3f'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare7in3g':
|
||||
elif config['ui']['display']['type'] in ('ws_7in3g', 'waveshare7in3g', 'ws7in3g', 'waveshare_73g', 'waveshare73g'):
|
||||
config['ui']['display']['type'] = 'waveshare7in3g'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare7in5':
|
||||
elif config['ui']['display']['type'] in ('ws_7in5', 'waveshare7in5', 'ws7in5', 'waveshare_75', 'waveshare75'):
|
||||
config['ui']['display']['type'] = 'waveshare7in5'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare7in5_HD':
|
||||
elif config['ui']['display']['type'] in ('ws_7in5hd', 'waveshare7in5hd', 'ws7in5hd', 'waveshare_75hd', 'waveshare75hd'):
|
||||
config['ui']['display']['type'] = 'waveshare7in5_HD'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare7in5_v2':
|
||||
elif config['ui']['display']['type'] in ('ws_7in5v2', 'waveshare7in5v2', 'ws7in5v2', 'waveshare_75v2', 'waveshare75v2'):
|
||||
config['ui']['display']['type'] = 'waveshare7in5_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare7in5b_HD':
|
||||
elif config['ui']['display']['type'] in ('ws_7in5bhd', 'waveshare7in5bhd', 'ws7in5bhd', 'waveshare_75bhd', 'waveshare75bhd'):
|
||||
config['ui']['display']['type'] = 'waveshare7in5b_HD'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare7in5b_v2':
|
||||
elif config['ui']['display']['type'] in ('ws_7in5bv2', 'waveshare7in5bv2', 'ws7in5bv2', 'waveshare_75bv2', 'waveshare75bv2'):
|
||||
config['ui']['display']['type'] = 'waveshare7in5b_v2'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare7in5bc':
|
||||
elif config['ui']['display']['type'] in ('ws_7in5bc', 'waveshare7in5bc', 'ws7in5bc', 'waveshare_75bc', 'waveshare75bc'):
|
||||
config['ui']['display']['type'] = 'waveshare7in5bc'
|
||||
|
||||
elif config['ui']['display']['type'] in 'waveshare13in3k':
|
||||
elif config['ui']['display']['type'] in ('ws_13in3k', 'waveshare13in3k', 'ws13in3k', 'waveshare_133k', 'waveshare133k'):
|
||||
config['ui']['display']['type'] = 'waveshare13in3k'
|
||||
|
||||
# WeAct e-ink
|
||||
elif config['ui']['display']['type'] in ('weact2in9', 'weact29in'):
|
||||
config['ui']['display']['type'] = 'weact2in9'
|
||||
|
||||
else:
|
||||
print("unsupported display type %s" % config['ui']['display']['type'])
|
||||
sys.exit(1)
|
||||
|
||||
Reference in New Issue
Block a user