Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Dispsylala
2019-10-29 23:21:29 +00:00
11 changed files with 622 additions and 4 deletions

View File

@ -104,6 +104,9 @@ def load_config(args):
elif config['ui']['display']['type'] in ('ws_154inch', 'ws154inch', 'waveshare_154inch', 'waveshare154inch'):
config['ui']['display']['type'] = 'waveshare154inch'
elif config['ui']['display']['type'] in ('ws_213d', 'ws213d', 'waveshare_213d', 'waveshare213d'):
config['ui']['display']['type'] = 'waveshare213d'
else:
print("unsupported display type %s" % config['ui']['display']['type'])
exit(1)