Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	Makefile
#	pwnagotchi/plugins/default/hashie.py
This commit is contained in:
jayofelony
2024-03-07 21:37:27 +01:00
132 changed files with 3297 additions and 1080 deletions

View File

@ -98,7 +98,7 @@ class GPS(plugins.Plugin):
lat_pos = (127, 74)
lon_pos = (122, 84)
alt_pos = (127, 94)
elif ui.is_waveshare27inch():
elif ui.is_waveshare2in7():
lat_pos = (6, 120)
lon_pos = (1, 135)
alt_pos = (6, 150)