Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Added motion_events_per_sec measurement

Browse source
This commit is contained in:
Fabio Manganiello 2019-09-24 01:17:13 +02:00
parent ff1fe3058b
commit d21fd64100
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platypush/plugins/gpio/sensor/motion/pwm3901.py
View file

@ -1,5 +1,6 @@
import enum import enum
import math import math
import time
# noinspection PyUnresolvedReferences,PyPackageRequirements # noinspection PyUnresolvedReferences,PyPackageRequirements
from pmw3901 import PMW3901, BG_CS_FRONT_BCM, BG_CS_BACK_BCM from pmw3901 import PMW3901, BG_CS_FRONT_BCM, BG_CS_BACK_BCM
@ -45,6 +46,8 @@ class GpioSensorMotionPwm3901Plugin(GpioSensorPlugin):
super().__init__(**kwargs) super().__init__(**kwargs)
self.spi_port = spi_port self.spi_port = spi_port
self._sensor = None self._sensor = None
self._events_per_sec = {}
self.x, self.y = (0, 0)
try: try:
if isinstance(rotation, int): if isinstance(rotation, int):
@ -84,6 +87,7 @@ class GpioSensorMotionPwm3901Plugin(GpioSensorPlugin):
"motion_x": 3, # Detected motion vector X-coord "motion_x": 3, # Detected motion vector X-coord
"motion_y": 4, # Detected motion vector Y-coord "motion_y": 4, # Detected motion vector Y-coord
"motion_mod": 5 # Detected motion vector module "motion_mod": 5 # Detected motion vector module
"motion_events_per_sec": 7 # Number of motion events detected in the last second
} }
""" """
@ -97,10 +101,20 @@ class GpioSensorMotionPwm3901Plugin(GpioSensorPlugin):
self._sensor = None self._sensor = None
return {}, str(e) return {}, str(e)
secs = int(time.time())
if (x, y) != (self.x, self.y):
(self.x, self.y) = (x, y)
if secs not in self._events_per_sec:
self._events_per_sec = {secs: 1}
else:
self._events_per_sec[secs] += 1
return { return {
'motion_x': x, 'motion_x': x,
'motion_y': y, 'motion_y': y,
'motion_mod': math.sqrt(x * x + y * y), 'motion_mod': math.sqrt(x * x + y * y),
'motion_events_per_sec': self._events_per_sec[secs],
} }