From d5f3e849a473f3b46b71d57850d7bdc59c43dd0b Mon Sep 17 00:00:00 2001 From: Ben Nuttall Date: Mon, 21 Sep 2015 17:14:33 +0100 Subject: [PATCH] Prefix lights and all properties and convert lists to tuples --- gpiozero/boards.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gpiozero/boards.py b/gpiozero/boards.py index ebdd7ae..79759b1 100644 --- a/gpiozero/boards.py +++ b/gpiozero/boards.py @@ -11,14 +11,14 @@ class TrafficLights(object): self.red = LED(red) self.amber = LED(amber) self.green = LED(green) - self.lights = [self.red, self.amber, self.green] + self._lights = (self.red, self.amber, self.green) - def lights_on(self): - for led in self.lights: + def on(self): + for led in self._lights: led.on() - def lights_off(self): - for led in self.lights: + def off(self): + for led in self._lights: led.off() @@ -27,7 +27,7 @@ class PiTraffic(TrafficLights): self.red = LED(9) self.amber = LED(10) self.green = LED(11) - self.lights = [self.red, self.amber, self.green] + self._lights = (self.red, self.amber, self.green) class FishDish(TrafficLights): @@ -36,21 +36,27 @@ class FishDish(TrafficLights): super(FishDish, self).__init__(red, amber, green) self.buzzer = Buzzer(8) self.button = Button(7) - self.all = self.lights + [self.buzzer] + self._all = tuple(list(self._lights) + [self.buzzer]) def on(self): - for led in self.all: - led.on() + for thing in self._all: + thing.on() def off(self): - for led in self.all: - led.off() + for thing in self._all: + thing.off() + + def lights_on(self): + super.on() + + def lights_off(self): + super.off() class PiLiter(object): def __init__(self): leds = [4, 17, 27, 18, 22, 23, 24, 25] - self.leds = [LED(led) for led in leds] + self.leds = tuple([LED(led) for led in leds]) def on(self): for led in self.leds: