Merge branch 'master' into master

This commit is contained in:
opteeks
2019-11-02 13:48:11 -07:00
committed by GitHub
99 changed files with 5493 additions and 1926 deletions

View File

@ -1,7 +1,8 @@
import os
import logging
import pwnagotchi.plugins as plugins
import threading
import pwnagotchi.plugins as plugins
import pwnagotchi.ui.hw as hw
import pwnagotchi.ui.web as web
from pwnagotchi.ui.view import View
@ -18,6 +19,14 @@ class Display(View):
self.init_display()
self._canvas_next_event = threading.Event()
self._canvas_next = None
self._render_thread_instance = threading.Thread(
target=self._render_thread,
daemon=True
)
self._render_thread_instance.start()
def is_inky(self):
return self._implementation.name == 'inky'
@ -42,6 +51,15 @@ class Display(View):
def is_lcdhat(self):
return self._implementation.name == 'lcdhat'
def is_dfrobot(self):
return self._implementation.name == 'dfrobot'
def is_waveshare154inch(self):
return self._implementation.name == 'waveshare154inch'
def is_waveshare213d(self):
return self._implementation.name == 'waveshare213d'
def is_waveshare_any(self):
return self.is_waveshare_v1() or self.is_waveshare_v2()
@ -62,6 +80,14 @@ class Display(View):
img = self._canvas if self._rotation == 0 else self._canvas.rotate(-self._rotation)
return img
def _render_thread(self):
"""Used for non-blocking screen updating."""
while True:
self._canvas_next_event.wait()
self._canvas_next_event.clear()
self._implementation.render(self._canvas_next)
def _on_view_rendered(self, img):
web.update_frame(img)
try:
@ -73,4 +99,5 @@ class Display(View):
if self._enabled:
self._canvas = (img if self._rotation == 0 else img.rotate(self._rotation))
if self._implementation is not None:
self._implementation.render(self._canvas)
self._canvas_next = self._canvas
self._canvas_next_event.set()