lukmangrd/platypush
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added gpio.cleanup at the end of get_measurement in distance sensor plugin

Browse source
This commit is contained in:
Fabio Manganiello 2019-12-20 21:40:57 +01:00
parent 4090570278
commit 58b0b48393
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
platypush/plugins/gpio/sensor/distance/__init__.py
View file

@ -24,33 +24,21 @@ class GpioSensorDistancePlugin(GpioPlugin, GpioSensorPlugin):
:type echo_pin: int :type echo_pin: int
""" """
import RPi.GPIO as gpio
GpioPlugin.__init__(self, *args, **kwargs) GpioPlugin.__init__(self, *args, **kwargs)
self.trigger_pin = trigger_pin self.trigger_pin = trigger_pin
self.echo_pin = echo_pin self.echo_pin = echo_pin
self._is_probing = False self._is_probing = False
def _init_gpio(self):
import RPi.GPIO as gpio
gpio.setmode(self.mode) gpio.setmode(self.mode)
gpio.setup(self.trigger_pin, gpio.OUT) gpio.setup(self.trigger_pin, gpio.OUT)
gpio.setup(self.echo_pin, gpio.IN) gpio.setup(self.echo_pin, gpio.IN)
self.logger.info('Resetting trigger sensor on GPIO pin {}'.format(self.trigger_pin))
gpio.output(self.trigger_pin, False) gpio.output(self.trigger_pin, False)
def _get_data(self):
@action
def get_measurement(self):
"""
Extends :func:`.GpioSensorPlugin.get_measurement`
:returns: Distance measurement as a scalar (in mm):
"""
import RPi.GPIO as gpio import RPi.GPIO as gpio
gpio.setmode(gpio.BCM) self._init_gpio()
gpio.setup(self.trigger_pin, gpio.OUT)
gpio.setup(self.echo_pin, gpio.IN)
gpio.output(self.trigger_pin, True) gpio.output(self.trigger_pin, True)
time.sleep(0.00001) # 1 us pulse to trigger echo measurement time.sleep(0.00001) # 1 us pulse to trigger echo measurement
@ -88,4 +76,19 @@ class GpioSensorDistancePlugin(GpioPlugin, GpioSensorPlugin):
return round(pulse_duration * 171500.0, 2) return round(pulse_duration * 171500.0, 2)
@action
def get_measurement(self):
"""
Extends :func:`.GpioSensorPlugin.get_measurement`
:returns: Distance measurement as a scalar (in mm):
"""
import RPi.GPIO as gpio
try:
return self._get_data()
finally:
gpio.cleanup()
# vim:sw=4:ts=4:et: # vim:sw=4:ts=4:et: