scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix few errors with OledHat

Browse Source
This commit is contained in:
Administrator 2019-10-14 20:41:41 +02:00
parent 26ff5c95f2
commit c8953d4654
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pwnagotchi/ui/layout.py
View File

@ -42,7 +42,7 @@ def papirus(config, layout):
layout['friend_face'] = (0, (layout['height'] * 0.88) - 15) layout['friend_face'] = (0, (layout['height'] * 0.88) - 15)
layout['friend_name'] = (40, (layout['height'] * 0.88) - 13) layout['friend_name'] = (40, (layout['height'] * 0.88) - 13)
layout['shakes'] = (0, layout['height'] - int(layout['height'] * .12) + 1) layout['shakes'] = (0, layout['height'] - int(layout['height'] * .12) + 1)
layout['mode'] = layout['mode'] = (layout['width'] - 25, layout['height'] - int(layout['height'] * .12) + 1) layout['mode'] = (layout['width'] - 25, layout['height'] - int(layout['height'] * .12) + 1)
layout['status'] = { layout['status'] = {
'pos': (85, int(layout['height'] * .15)), 'pos': (85, int(layout['height'] * .15)),
'font': fonts.Medium, 'font': fonts.Medium,
@ -52,26 +52,25 @@ def papirus(config, layout):
def oledhat(config, layout): def oledhat(config, layout):
fonts.setup(10, 8, 10, 23) fonts.setup(8, 8, 8, 8)
layout['width'] = 200 layout['width'] = 128
layout['height'] = 96 layout['height'] = 64
layout['face'] = (0, int(layout['height'] / 4)) layout['face'] = (0, 32)
layout['name'] = (5, int(layout['height'] * .15)) layout['name'] = (0, 10)
layout['channel'] = (0, 0) layout['channel'] = (0, 0)
layout['aps'] = (25, 0) layout['aps'] = (25, 0)
layout['uptime'] = (layout['width'] - 65, 0) layout['uptime'] = (70, 0)
layout['line1'] = [0, int(layout['height'] * .12), layout['width'], int(layout['height'] * .12)] layout['line1'] = [0, 9, 128, 9]
layout['line2'] = [0, layout['height'] - int(layout['height'] * .12), layout['width'], layout['line2'] = [0, 53, 128, 53]
layout['height'] - int(layout['height'] * .12)]
layout['friend_face'] = (0, (layout['height'] * 0.88) - 15) layout['friend_face'] = (0, (layout['height'] * 0.88) - 15)
layout['friend_name'] = (40, (layout['height'] * 0.88) - 13) layout['friend_name'] = (40, (layout['height'] * 0.88) - 13)
layout['shakes'] = (0, layout['height'] - int(layout['height'] * .12) + 1) layout['shakes'] = (0, 53)
layout['mode'] = layout['mode'] = (layout['width'] - 25, layout['height'] - int(layout['height'] * .12) + 1) layout['mode'] = (103, 10)
layout['status'] = { layout['status'] = {
'pos': (85, int(layout['height'] * .15)), 'pos': (30, 18),
'font': fonts.Medium, 'font': fonts.Small,
'max': (layout['width'] - 100) // 6 'max': (20) // 6
} }
return layout return layout
@ -93,7 +92,7 @@ def waveshare(config, layout):
layout['friend_face'] = (0, (layout['height'] * 0.88) - 15) layout['friend_face'] = (0, (layout['height'] * 0.88) - 15)
layout['friend_name'] = (40, (layout['height'] * 0.88) - 13) layout['friend_name'] = (40, (layout['height'] * 0.88) - 13)
layout['shakes'] = (0, layout['height'] - int(layout['height'] * .12) + 1) layout['shakes'] = (0, layout['height'] - int(layout['height'] * .12) + 1)
layout['mode'] = layout['mode'] = (layout['width'] - 25, layout['height'] - int(layout['height'] * .12) + 1) layout['mode'] = (layout['width'] - 25, layout['height'] - int(layout['height'] * .12) + 1)
else: else:
fonts.setup(10, 8, 10, 25) fonts.setup(10, 8, 10, 25)
@ -112,7 +111,7 @@ def waveshare(config, layout):
layout['friend_face'] = (0, (layout['height'] * 0.88) - 15) layout['friend_face'] = (0, (layout['height'] * 0.88) - 15)
layout['friend_name'] = (40, (layout['height'] * 0.88) - 13) layout['friend_name'] = (40, (layout['height'] * 0.88) - 13)
layout['shakes'] = (0, layout['height'] - int(layout['height'] * .12) + 1) layout['shakes'] = (0, layout['height'] - int(layout['height'] * .12) + 1)
layout['mode'] = layout['mode'] = (layout['width'] - 25, layout['height'] - int(layout['height'] * .12) + 1) layout['mode'] = (layout['width'] - 25, layout['height'] - int(layout['height'] * .12) + 1)
layout['status'] = { layout['status'] = {
'pos': (125, 20), 'pos': (125, 20),