Merge pull request #167 from waveform80/fix-sense-hat

Fix Sense HAT monitor

piwheels-master.service

@@ -10,6 +10,7 @@ NoNewPrivileges=true
 TimeoutStartSec=3m
 TimeoutStopSec=5m
 ExecStart=/usr/local/bin/piw-master -v
+ExecStartPost=-chmod g+w /tmp/piw-status /tmp/piw-control
 
 [Install]
 WantedBy=multi-user.target

piwheels/__init__.py

@@ -84,7 +84,7 @@
     'logger':  ['lars'],
     'test':    ['pytest', 'coverage'],
     'doc':     ['sphinx'],
-    'sense':   ['pisense'],
+    'sense':   ['pisense', 'python-dateutil'],
 }
 
 __classifiers__ = [

piwheels/sense/__init__.py

@@ -42,11 +42,15 @@
 
 from pisense import SenseHAT, StickEvent, array
 from colorzero import Color
+from dateutil import tz
 
 from .. import terminal, const, protocols, transport, tasks
 from .renderers import MainRenderer, StatusRenderer, QuitRenderer
 
 
+LOCAL = tz.tzlocal()
+
+
 class PiWheelsSense:
     """
     This is the main class for the :program:`piw-sense` script. It
@@ -118,7 +122,13 @@ def run(self):
             while not self._quit:
                 event = self.stick.read(0.1)
                 if event is not None and event.pressed:
-                    self.stick_queue.send_msg('EVENT', event)
+                    self.stick_queue.send_msg('EVENT', (
+                        event.timestamp.replace(tzinfo=LOCAL),
+                        event.direction,
+                        event.pressed,
+                        event.held,
+                    ))
+
         finally:
             self.stick_queue.close()
 
@@ -127,7 +137,7 @@ class ScreenTask(tasks.Task):
     name = "screen"
 
     def __init__(self, config, hat):
-        super().__init__()
+        super().__init__(config)
         self.screen = hat.screen
         self.renderers = {}
         self.renderers['main'] = MainRenderer()

piwheels/sense/renderers.py

@@ -106,7 +106,7 @@ def __init__(self):
         self.status = {}
         self.position = (0, 3)
         self.limits = (0, 3, 7, 7)
-        self.last_message = datetime(1970, 1, 1)
+        self.last_message = datetime(1970, 1, 1, tzinfo=UTC)
         self.blue_grad = list(Color('blue').gradient(Color('white'), 32))
 
     def message(self, msg, data):
@@ -240,10 +240,6 @@ def __init__(self, main):
         self.update_text()
 
     def move(self, event, task):
-        if event.direction == 'enter' and self.position[0] == 4:
-            task.ctrl_queue.send_pyobj(['QUIT'])
-        if event.direction == 'enter' and self.position[0] >= 4:
-            signal.pthread_kill(main_thread().ident, signal.SIGINT)
         delta = super().move(event, task)
         if event.direction == 'down':
             task.renderer = self.main
@@ -362,7 +358,7 @@ def __init__(self, main):
 
     def move(self, event, task):
         if event.direction == 'enter' and self.position[0] == 1:
-            task.ctrl_queue.send_pyobj(['QUIT'])
+            task.ctrl_queue.send_msg('QUIT')
         if event.direction == 'enter':
             signal.pthread_kill(main_thread().ident, signal.SIGINT)
         delta = super().move(event, task)