Prefix lights and all properties and convert lists to tuples

This commit is contained in:
Ben Nuttall
2015-09-21 17:14:33 +01:00
parent 5669a98b42
commit d5f3e849a4

View File

@@ -11,14 +11,14 @@ class TrafficLights(object):
self.red = LED(red) self.red = LED(red)
self.amber = LED(amber) self.amber = LED(amber)
self.green = LED(green) self.green = LED(green)
self.lights = [self.red, self.amber, self.green] self._lights = (self.red, self.amber, self.green)
def lights_on(self): def on(self):
for led in self.lights: for led in self._lights:
led.on() led.on()
def lights_off(self): def off(self):
for led in self.lights: for led in self._lights:
led.off() led.off()
@@ -27,7 +27,7 @@ class PiTraffic(TrafficLights):
self.red = LED(9) self.red = LED(9)
self.amber = LED(10) self.amber = LED(10)
self.green = LED(11) self.green = LED(11)
self.lights = [self.red, self.amber, self.green] self._lights = (self.red, self.amber, self.green)
class FishDish(TrafficLights): class FishDish(TrafficLights):
@@ -36,21 +36,27 @@ class FishDish(TrafficLights):
super(FishDish, self).__init__(red, amber, green) super(FishDish, self).__init__(red, amber, green)
self.buzzer = Buzzer(8) self.buzzer = Buzzer(8)
self.button = Button(7) self.button = Button(7)
self.all = self.lights + [self.buzzer] self._all = tuple(list(self._lights) + [self.buzzer])
def on(self): def on(self):
for led in self.all: for thing in self._all:
led.on() thing.on()
def off(self): def off(self):
for led in self.all: for thing in self._all:
led.off() thing.off()
def lights_on(self):
super.on()
def lights_off(self):
super.off()
class PiLiter(object): class PiLiter(object):
def __init__(self): def __init__(self):
leds = [4, 17, 27, 18, 22, 23, 24, 25] 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): def on(self):
for led in self.leds: for led in self.leds: