Mirrors/grow-python
1
0
Fork 0
mirror of https://github.com/pimoroni/grow-python synced 2025-10-25 15:19:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-index channels from 1

Browse Source
This commit is contained in:
Phil Howard
2020-05-21 11:43:40 +01:00
parent c054a0a5b4
commit 605d6fdc47
3 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/grow/moisture.py
View File

@@ -10,19 +10,19 @@ MOISTURE_INT_PIN = 4
class Moisture(object):
"""Grow moisture sensor driver."""
def __init__(self, channel=0, wet_point=None, dry_point=None):
def __init__(self, channel=1, wet_point=None, dry_point=None):
"""Create a new moisture sensor.
Uses an interrupt to count pulses on the GPIO pin corresponding to the selected channel.
The moisture reading is given as pulses per second.
:param channel: One of 0, 1 or 2. 3 can optionally be used to set up a sensor on the Int pin (BCM4)
:param channel: One of 1, 2 or 3. 4 can optionally be used to set up a sensor on the Int pin (BCM4)
:param wet_point: Wet point in pulses/sec
:param dry_point: Dry point in pulses/sec
"""
self._gpio_pin = [MOISTURE_1_PIN, MOISTURE_2_PIN, MOISTURE_3_PIN, MOISTURE_INT_PIN][channel]
self._gpio_pin = [MOISTURE_1_PIN, MOISTURE_2_PIN, MOISTURE_3_PIN, MOISTURE_INT_PIN][channel - 1]
GPIO.setwarnings(False)
GPIO.setmode(GPIO.BCM)
@@ -30,6 +30,7 @@ class Moisture(object):
self._count = 0
self._reading = 0
self._new_data = False
self._wet_point = wet_point if wet_point is not None else 100
self._dry_point = dry_point if dry_point is not None else 900
self._time_start = time.time()

18
library/grow/pump.py
View File

@@ -7,12 +7,22 @@ PUMP_1_PIN = 17
PUMP_2_PIN = 27
PUMP_3_PIN = 22
PUMP_PWM_FREQ = 10000
PUMP_MAX_DUTY = 60
PUMP_MAX_DUTY = 90
class Pump(object):
def __init__(self, channel):
self._gpio_pin = [PUMP_1_PIN, PUMP_2_PIN, PUMP_3_PIN][channel]
"""Grow pump driver."""
def __init__(self, channel=1):
"""Create a new pump.
Uses soft PWM to drive a Grow pump.
:param channel: One of 1, 2 or 3.
"""
self._gpio_pin = [PUMP_1_PIN, PUMP_2_PIN, PUMP_3_PIN][channel - 1]
GPIO.setmode(GPIO.BCM)
GPIO.setwarnings(False)
@@ -37,7 +47,7 @@ class Pump(object):
"""Stop the pump."""
self.set_speed(0)
def pulse(self, speed, timeout=0.1, blocking=True, force=False):
def dose(self, speed, timeout=0.1, blocking=True, force=False):
"""Pulse the pump for timeout seconds.
:param timeout: Timeout, in seconds, of the pump pulse