KevinMidboe/python-gpiozero
1
0
Fork 0
mirror of https://github.com/KevinMidboe/python-gpiozero.git synced 2025-10-29 17:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #95 from waveform80/fix-90

Browse Source 
Fix #90
This commit is contained in:
Dave Jones
2015-10-27 20:05:00 +00:00
parent 010f1fd65c 43fbf03dd7
commit aa542f2fe0
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gpiozero/boards.py
View File

@@ -13,7 +13,7 @@ from time import sleep
from collections import namedtuple from collections import namedtuple
from .input_devices import InputDeviceError, Button from .input_devices import InputDeviceError, Button
from .output_devices import OutputDeviceError, LED, Buzzer, Motor from .output_devices import OutputDeviceError, LED, PWMLED, Buzzer, Motor
from .devices import CompositeDevice, SourceMixin from .devices import CompositeDevice, SourceMixin
@@ -21,9 +21,11 @@ class LEDBoard(SourceMixin, CompositeDevice):
""" """
A Generic LED Board or collection of LEDs. A Generic LED Board or collection of LEDs.
""" """
def __init__(self, *pins): def __init__(self, *pins, **kwargs):
super(LEDBoard, self).__init__() super(LEDBoard, self).__init__()
self._leds = tuple(LED(pin) for pin in pins) pwm = kwargs.get('pwm', False)
LEDClass = PWMLED if pwm else LED
self._leds = tuple(LEDClass(pin) for pin in pins)
def close(self): def close(self):
for led in self.leds: for led in self.leds:
@@ -99,12 +101,13 @@ class PiLiter(LEDBoard):
""" """
Ciseco Pi-LITEr: strip of 8 very bright LEDs. Ciseco Pi-LITEr: strip of 8 very bright LEDs.
""" """
def __init__(self): def __init__(self, pwm=False):
super(PiLiter, self).__init__(4, 17, 27, 18, 22, 23, 24, 25) super(PiLiter, self).__init__(4, 17, 27, 18, 22, 23, 24, 25, pwm=pwm)
TrafficLightTuple = namedtuple('TrafficLightTuple', ('red', 'amber', 'green')) TrafficLightTuple = namedtuple('TrafficLightTuple', ('red', 'amber', 'green'))
class TrafficLights(LEDBoard): class TrafficLights(LEDBoard):
""" """
Generic Traffic Lights set. Generic Traffic Lights set.
@@ -118,10 +121,12 @@ class TrafficLights(LEDBoard):
green: `None` green: `None`
Green LED pin Green LED pin
""" """
def __init__(self, red=None, amber=None, green=None): def __init__(self, red=None, amber=None, green=None, pwm=False):
if not all([red, amber, green]): if not all([red, amber, green]):
raise OutputDeviceError('red, amber and green pins must be provided') raise OutputDeviceError(
super(TrafficLights, self).__init__(red, amber, green) 'red, amber and green pins must be provided'
)
super(TrafficLights, self).__init__(red, amber, green, pwm=pwm)
@property @property
def value(self): def value(self):
@@ -129,7 +134,8 @@ class TrafficLights(LEDBoard):
@value.setter @value.setter
def value(self, value): def value(self, value):
super(TrafficLights, self).value = value # Eurgh, this is horrid but necessary (see #90)
super(TrafficLights, self.__class__).value.fset(self, value)
@property @property
def red(self): def red(self):
@@ -165,6 +171,7 @@ class PiTraffic(TrafficLights):
TrafficLightsBuzzerTuple = namedtuple('TrafficLightsBuzzerTuple', ( TrafficLightsBuzzerTuple = namedtuple('TrafficLightsBuzzerTuple', (
'red', 'amber', 'green', 'buzzer')) 'red', 'amber', 'green', 'buzzer'))
class TrafficLightsBuzzer(SourceMixin, CompositeDevice): class TrafficLightsBuzzer(SourceMixin, CompositeDevice):
""" """
A generic class for HATs with traffic lights, a button and a buzzer. A generic class for HATs with traffic lights, a button and a buzzer.
@@ -197,10 +204,11 @@ class TrafficLightsBuzzer(SourceMixin, CompositeDevice):
to update the state of all the board's components. to update the state of all the board's components.
""" """
return FishDishTuple( return FishDishTuple(
self.lights.red.value, self.lights.red.value,
self.lights.amber.value, self.lights.amber.value,
self.lights.green.value, self.lights.green.value,
self.buzzer.value) self.buzzer.value,
)
@value.setter @value.setter
def value(self, value): def value(self, value):
@@ -257,33 +265,38 @@ class FishDish(TrafficLightsBuzzer):
""" """
Pi Supply FishDish: traffic light LEDs, a button and a buzzer. Pi Supply FishDish: traffic light LEDs, a button and a buzzer.
""" """
def __init__(self): def __init__(self, pwm=False):
super(FishDish, self).__init__( super(FishDish, self).__init__(
TrafficLights(9, 22, 4), TrafficLights(9, 22, 4, pwm=pwm),
Buzzer(8), Buzzer(8),
Button(7, pull_up=False)) Button(7, pull_up=False),
)
class TrafficHat(TrafficLightsBuzzer): class TrafficHat(TrafficLightsBuzzer):
""" """
Ryanteck Traffic HAT: traffic light LEDs, a button and a buzzer. Ryanteck Traffic HAT: traffic light LEDs, a button and a buzzer.
""" """
def __init__(self): def __init__(self, pwm=False):
super(TrafficHat, self).__init__( super(TrafficHat, self).__init__(
TrafficLights(22, 23, 24), TrafficLights(22, 23, 24, pwm=pwm),
Buzzer(5), Buzzer(5),
Button(25)) Button(25),
)
RobotTuple = namedtuple('RobotTuple', ('left', 'right')) RobotTuple = namedtuple('RobotTuple', ('left', 'right'))
class Robot(SourceMixin, CompositeDevice): class Robot(SourceMixin, CompositeDevice):
""" """
Generic dual-motor Robot. Generic dual-motor Robot.
""" """
def __init__(self, left=None, right=None): def __init__(self, left=None, right=None):
if not all([left, right]): if not all([left, right]):
raise OutputDeviceError('left and right motor pins must be provided') raise OutputDeviceError(
'left and right motor pins must be provided'
)
super(Robot, self).__init__() super(Robot, self).__init__()
self._left = Motor(*left) self._left = Motor(*left)
self._right = Motor(*right) self._right = Motor(*right)