Mercurial > code > home > repos > homeauto
annotate service/piNode/devices.py @ 324:d5dec124ccfe
clamp led brightness
Ignore-this: 7bd6777e794fec977b09f0052939ed4f
| author | drewp@bigasterisk.com |
|---|---|
| date | Mon, 15 Jan 2018 03:00:26 -0800 |
| parents | f420207c7fb4 |
| children | a94f2a522d41 |
| rev | line source |
|---|---|
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
1 """ |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
2 https://github.com/juniorug/libsensorPy is a similar project |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
3 """ |
| 182 | 4 from __future__ import division |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
5 |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
6 import time, logging, os |
|
243
141079644c45
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp@bigasterisk.com
parents:
233
diff
changeset
|
7 from rdflib import Namespace, URIRef, Literal |
| 274 | 8 from twisted.internet import reactor |
| 182 | 9 |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
10 try: |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
11 import pigpio |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
12 except ImportError: |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
13 pigpio = None |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
14 import w1thermsensor |
|
322
f420207c7fb4
switch neopixel libs. lost the r/g/b remapping feature
drewp@bigasterisk.com
parents:
304
diff
changeset
|
15 import rpi_ws281x |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
16 |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
17 def setupPwm(pi, pinNumber, hz=8000): |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
18 pi.set_mode(pinNumber, pigpio.OUTPUT) |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
19 # see http://abyz.co.uk/rpi/pigpio/cif.html#gpioCfgClock |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
20 # and http://abyz.co.uk/rpi/pigpio/cif.html#gpioSetPWMfrequency |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
21 actual = pi.set_PWM_frequency(pinNumber, hz) |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
22 if actual != hz: |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
23 raise ValueError('pwm actual=%s' % actual) |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
24 pi.set_PWM_dutycycle(pinNumber, 0) |
| 259 | 25 |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
26 import sys |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
27 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
28 log = logging.getLogger() |
| 182 | 29 ROOM = Namespace('http://projects.bigasterisk.com/room/') |
| 209 | 30 XSD = Namespace('http://www.w3.org/2001/XMLSchema#') |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
31 RDFS = Namespace('http://www.w3.org/2000/01/rdf-schema#') |
| 182 | 32 |
| 33 class DeviceType(object): | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
34 deviceType = NotImplementedError |
| 182 | 35 @classmethod |
| 36 def findInstances(cls, graph, board, pi): | |
| 37 """ | |
| 38 return any number of instances of this class for all the separately | |
| 39 controlled devices on the board. Two LEDS makes two instances, | |
| 40 but two sensors on the same onewire bus makes only one device | |
| 41 (which yields more statements). | |
| 42 """ | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
43 log.debug("graph has any connected devices of type %s?", cls.deviceType) |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
44 for row in graph.query("""SELECT ?dev ?gpioNumber WHERE { |
| 182 | 45 ?board :hasPin ?pin . |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
46 ?pin :gpioNumber ?gpioNumber; |
| 182 | 47 :connectedTo ?dev . |
| 48 ?dev a ?thisType . | |
| 49 } ORDER BY ?dev""", | |
| 50 initBindings=dict(board=board, | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
51 thisType=cls.deviceType)): |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
52 yield cls(graph, row.dev, pi, int(row.gpioNumber)) |
| 182 | 53 |
| 54 def __init__(self, graph, uri, pi, pinNumber): | |
| 55 self.graph, self.uri, self.pi = graph, uri, pi | |
| 56 self.pinNumber = pinNumber | |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
57 self.hostStateInit() |
| 182 | 58 |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
59 def hostStateInit(self): |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
60 """ |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
61 If you don't want to use __init__, you can use this to set up |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
62 whatever storage you might need for hostStatements |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
63 """ |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
64 |
| 182 | 65 def description(self): |
| 66 return { | |
| 67 'uri': self.uri, | |
| 68 'className': self.__class__.__name__, | |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
69 'pinNumber': getattr(self, 'pinNumber', None), |
| 182 | 70 'outputPatterns': self.outputPatterns(), |
| 71 'watchPrefixes': self.watchPrefixes(), | |
| 72 'outputWidgets': self.outputWidgets(), | |
| 73 } | |
| 74 | |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
75 def hostStatements(self): |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
76 """ |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
77 Like readFromPoll but these statements come from the host-side |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
78 python code, not the connected device. Include output state |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
79 (e.g. light brightness) if its master version is in this |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
80 object. This method is called on /graph requests so it should |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
81 be fast. |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
82 """ |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
83 return [] |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
84 |
| 182 | 85 def watchPrefixes(self): |
| 86 """ | |
| 87 subj,pred pairs of the statements that might be returned from | |
| 88 readFromPoll, so the dashboard knows what it should | |
| 89 watch. This should be eliminated, as the dashboard should just | |
| 90 always watch the whole tree of statements starting self.uri | |
| 91 """ | |
| 92 return [] | |
| 93 | |
| 94 def poll(self): | |
| 95 return [] # statements | |
| 96 | |
| 97 def outputPatterns(self): | |
| 98 """ | |
| 99 Triple patterns, using None as a wildcard, that should be routed | |
| 100 to sendOutput | |
| 101 """ | |
| 102 return [] | |
| 103 | |
| 104 def outputWidgets(self): | |
| 105 """ | |
| 106 structs to make output widgets on the dashboard. ~1 of these per | |
| 107 handler you have in sendOutput | |
| 108 """ | |
| 109 return [] | |
| 110 | |
| 111 def sendOutput(self, statements): | |
| 112 """ | |
| 113 If we got statements that match this class's outputPatterns, this | |
| 114 will be called with the statements that matched. | |
| 115 | |
| 116 Todo: it would be fine to read back confirmations or | |
| 117 whatever. Just need a way to collect them into graph statements. | |
| 118 """ | |
| 119 raise NotImplementedError | |
| 120 | |
| 121 _knownTypes = set() | |
| 122 def register(deviceType): | |
| 123 _knownTypes.add(deviceType) | |
| 124 return deviceType | |
| 125 | |
| 126 @register | |
| 127 class MotionSensorInput(DeviceType): | |
| 290 | 128 """ |
| 129 0 30s 60s 90s 10min | |
| 130 | | | | ... | | |
| 131 Sensor input ******** ** ******* **** | |
| 132 :sees output ........ .. ....... .... | |
| 133 :seesRecently ............................................................. | |
| 134 :seesRecently30 .................................... | |
| 135 :motionStart x x x x | |
| 136 :motionStart30 x x | |
| 137 """ | |
| 138 # compare motion sensor lib at | |
| 139 # https://gpiozero.readthedocs.org/en/v1.2.0/api_input.html#motion-sensor-d-sun-pir | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
140 # which is a bit fancier |
| 182 | 141 deviceType = ROOM['MotionSensor'] |
| 142 | |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
143 def __init__(self, graph, uri, pi, pinNumber): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
144 super(MotionSensorInput, self).__init__(graph, uri, pi, pinNumber) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
145 self.pi.set_mode(pinNumber, pigpio.INPUT) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
146 self.pi.set_pull_up_down(pinNumber, pigpio.PUD_DOWN) |
| 182 | 147 |
|
254
ba1149814877
pi device support for motionStart edge trigger
drewp@bigasterisk.com
parents:
251
diff
changeset
|
148 def hostStateInit(self): |
|
ba1149814877
pi device support for motionStart edge trigger
drewp@bigasterisk.com
parents:
251
diff
changeset
|
149 self.lastRead = None |
| 290 | 150 self.lastMotionStart30 = 0 |
| 151 self.lastMotionStart90 = 0 | |
|
254
ba1149814877
pi device support for motionStart edge trigger
drewp@bigasterisk.com
parents:
251
diff
changeset
|
152 |
| 182 | 153 def poll(self): |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
154 motion = self.pi.read(self.pinNumber) |
| 290 | 155 now = time.time() |
| 182 | 156 |
|
254
ba1149814877
pi device support for motionStart edge trigger
drewp@bigasterisk.com
parents:
251
diff
changeset
|
157 oneshot = [] |
|
ba1149814877
pi device support for motionStart edge trigger
drewp@bigasterisk.com
parents:
251
diff
changeset
|
158 if self.lastRead is not None and motion != self.lastRead: |
|
ba1149814877
pi device support for motionStart edge trigger
drewp@bigasterisk.com
parents:
251
diff
changeset
|
159 oneshot = [(self.uri, ROOM['sees'], ROOM['motionStart'])] |
| 290 | 160 for v, t in [('lastMotionStart30', 30), ('lastMotionStart90', 90)]: |
| 161 if now - getattr(self, v) > t: | |
| 162 oneshot.append((self.uri, ROOM['sees'], ROOM['motionStart%s' % t])) | |
| 163 setattr(self, v, now) | |
|
254
ba1149814877
pi device support for motionStart edge trigger
drewp@bigasterisk.com
parents:
251
diff
changeset
|
164 self.lastRead = motion |
|
ba1149814877
pi device support for motionStart edge trigger
drewp@bigasterisk.com
parents:
251
diff
changeset
|
165 |
|
251
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
166 return {'latest': [ |
| 182 | 167 (self.uri, ROOM['sees'], |
| 168 ROOM['motion'] if motion else ROOM['noMotion']), | |
| 290 | 169 ] + self.recentMotionStatements(now, motion), |
| 267 | 170 'oneshot': oneshot} |
| 182 | 171 |
| 290 | 172 def recentMotionStatements(self, now, motion): |
| 182 | 173 if not hasattr(self, 'lastMotionTime'): |
| 174 self.lastMotionTime = 0 | |
| 175 if motion: | |
| 176 self.lastMotionTime = now | |
| 267 | 177 dt = now - self.lastMotionTime |
| 178 return [(self.uri, ROOM['seesRecently'], | |
| 179 ROOM['motion'] if (dt < 60 * 10) else ROOM['noMotion']), | |
| 180 (self.uri, ROOM['seesRecently30'], | |
| 181 ROOM['motion'] if (dt < 30) else ROOM['noMotion'])] | |
| 182 | 182 |
| 183 def watchPrefixes(self): | |
| 184 return [ | |
| 185 (self.uri, ROOM['sees']), | |
| 186 (self.uri, ROOM['seesRecently']), | |
| 267 | 187 (self.uri, ROOM['seesRecently30']), |
| 182 | 188 ] |
| 189 | |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
190 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
191 @register |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
192 class RgbStrip(DeviceType): |
| 220 | 193 """3 PWMs for r/g/b on a strip""" |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
194 # pigpio daemon is working fine, but |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
195 # https://github.com/RPi-Distro/python-gpiozero/blob/59ba7154c5918745ac894ea03503667d6473c760/gpiozero/output_devices.py#L213 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
196 # can also apparently do PWM |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
197 deviceType = ROOM['RgbStrip'] |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
198 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
199 @classmethod |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
200 def findInstances(cls, graph, board, pi): |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
201 for row in graph.query("""SELECT DISTINCT ?dev ?r ?g ?b WHERE { |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
202 ?board |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
203 :hasPin ?rpin; |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
204 :hasPin ?gpin; |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
205 :hasPin ?bpin . |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
206 ?dev a :RgbStrip; |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
207 :redChannel ?rpin; |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
208 :greenChannel ?gpin; |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
209 :blueChannel ?bpin . |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
210 ?rpin :gpioNumber ?r . |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
211 ?gpin :gpioNumber ?g . |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
212 ?bpin :gpioNumber ?b . |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
213 } ORDER BY ?dev""", |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
214 initBindings=dict(board=board), |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
215 initNs={'': ROOM}): |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
216 log.debug('found rgb %r', row) |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
217 yield cls(graph, row.dev, pi, row.r, row.g, row.b) |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
218 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
219 def __init__(self, graph, uri, pi, r, g, b): |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
220 self.graph, self.uri, self.pi = graph, uri, pi |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
221 self.rgb = map(int, [r, g, b]) |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
222 self.value = '#000000' |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
223 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
224 def setup(self): |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
225 for i in self.rgb: |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
226 setupPwm(self.pi, i) |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
227 |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
228 def hostStatements(self): |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
229 return [(self.uri, ROOM['color'], Literal(self.value))] |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
230 |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
231 def outputPatterns(self): |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
232 return [(self.uri, ROOM['color'], None)] |
| 220 | 233 |
| 234 def _rgbFromHex(self, h): | |
| 235 rrggbb = h.lstrip('#') | |
| 236 return [int(x, 16) for x in [rrggbb[0:2], rrggbb[2:4], rrggbb[4:6]]] | |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
237 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
238 def sendOutput(self, statements): |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
239 assert len(statements) == 1 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
240 assert statements[0][:2] == (self.uri, ROOM['color']) |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
241 |
| 220 | 242 rgb = self._rgbFromHex(statements[0][2]) |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
243 self.value = statements[0][2] |
|
183
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
244 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
245 for (i, v) in zip(self.rgb, rgb): |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
246 self.pi.set_PWM_dutycycle(i, v) |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
247 |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
248 def outputWidgets(self): |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
249 return [{ |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
250 'element': 'output-rgb', |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
251 'subj': self.uri, |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
252 'pred': ROOM['color'], |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
253 }] |
|
634d6e477953
get piNode working, for motionsensor at least
drewp@bigasterisk.com
parents:
182
diff
changeset
|
254 |
| 210 | 255 |
| 256 @register | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
257 class TempHumidSensor(DeviceType): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
258 deviceType = ROOM['TempHumidSensor'] |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
259 pollPeriod = 5 |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
260 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
261 def __init__(self, *a, **kw): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
262 DeviceType.__init__(self, *a, **kw) |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
263 import Adafruit_DHT |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
264 self.mod = Adafruit_DHT |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
265 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
266 def poll(self): |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
267 for tries in range(1): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
268 # fails a lot, but I don't want to add too much delay in |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
269 # here- the next poll is coming soon |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
270 humid, tempC = self.mod.read(self.mod.DHT22, self.pinNumber) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
271 if humid and tempC: |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
272 break |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
273 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
274 stmts = set() |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
275 if humid is not None: |
|
232
4e91f3ec460b
more round() workarounds for mismatching literals not patching themselves out
drewp@bigasterisk.com
parents:
221
diff
changeset
|
276 stmts.add((self.uri, ROOM['humidity'], Literal(round(humid, 2)))) |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
277 else: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
278 stmts.add((self.uri, RDFS['comment'], |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
279 Literal('DHT read returned None'))) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
280 if tempC is not None: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
281 stmts.add((self.uri, ROOM['temperatureF'], |
|
232
4e91f3ec460b
more round() workarounds for mismatching literals not patching themselves out
drewp@bigasterisk.com
parents:
221
diff
changeset
|
282 # see round() note in arduinoNode/devices.py |
|
4e91f3ec460b
more round() workarounds for mismatching literals not patching themselves out
drewp@bigasterisk.com
parents:
221
diff
changeset
|
283 Literal(round(tempC * 9 / 5 + 32, 2)))) |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
284 else: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
285 stmts.add((self.uri, RDFS['comment'], |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
286 Literal('DHT read returned None'))) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
287 return stmts |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
288 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
289 def watchPrefixes(self): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
290 return [ |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
291 (self.uri, ROOM['temperatureF']), |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
292 (self.uri, ROOM['humidity']), |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
293 ] |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
294 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
295 @register |
| 244 | 296 class PushbuttonInput(DeviceType): |
| 297 """add a switch to ground; we'll turn on pullup""" | |
| 298 deviceType = ROOM['Pushbutton'] | |
| 299 | |
| 300 def __init__(self, *a, **kw): | |
| 301 DeviceType.__init__(self, *a, **kw) | |
| 302 log.debug("setup switch on %r", self.pinNumber) | |
| 303 self.pi.set_mode(self.pinNumber, pigpio.INPUT) | |
| 304 self.pi.set_pull_up_down(self.pinNumber, pigpio.PUD_UP) | |
|
251
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
305 self.lastClosed = None |
| 262 | 306 self.invert = (self.uri, ROOM['style'], |
| 307 ROOM['inverted']) in self.graph | |
| 244 | 308 |
| 309 def poll(self): | |
| 310 closed = not self.pi.read(self.pinNumber) | |
| 262 | 311 if self.invert: |
| 312 closed = not closed | |
|
251
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
313 |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
314 if self.lastClosed is not None and closed != self.lastClosed: |
| 262 | 315 log.debug('%s changed to %s', self.uri, closed) |
|
251
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
316 oneshot = [ |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
317 (self.uri, ROOM['buttonState'], |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
318 ROOM['press'] if closed else ROOM['release']), |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
319 ] |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
320 else: |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
321 oneshot = [] |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
322 self.lastClosed = closed |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
323 |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
324 return {'latest': [ |
| 244 | 325 (self.uri, ROOM['buttonState'], |
| 326 ROOM['pressed'] if closed else ROOM['notPressed']), | |
|
251
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
327 ], |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
328 'oneshot':oneshot} |
| 244 | 329 |
| 330 def watchPrefixes(self): | |
| 331 return [ | |
| 332 (self.uri, ROOM['buttonState']), | |
| 333 ] | |
| 334 | |
| 335 @register | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
336 class OneWire(DeviceType): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
337 """ |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
338 Also see /my/proj/ansible/roles/raspi_io_node/tasks/main.yml for |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
339 some system config that contains the pin number that you want to |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
340 use for onewire. The pin number in this config is currently ignored. |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
341 """ |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
342 deviceType = ROOM['OneWire'] |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
343 pollPeriod = 2 |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
344 # deliberately written like arduinoNode's one for an easier merge. |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
345 def __init__(self, *a, **kw): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
346 DeviceType.__init__(self, *a, **kw) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
347 log.info("scan for w1 devices") |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
348 self._sensors = w1thermsensor.W1ThermSensor.get_available_sensors() |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
349 for s in self._sensors: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
350 # Something looks different about these ids |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
351 # ('000003a5a94c') vs the ones I get from arduino |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
352 # ('2813bea50300003d'). Not sure if I'm parsing them |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
353 # differently or what. |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
354 s.uri = URIRef(os.path.join(self.uri, 'dev-%s' % s.id)) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
355 log.info(' found temperature sensor %s' % s.uri) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
356 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
357 def poll(self): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
358 try: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
359 stmts = [] |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
360 for sensor in self._sensors: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
361 stmts.append((self.uri, ROOM['connectedTo'], sensor.uri)) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
362 try: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
363 tempF = sensor.get_temperature(sensor.DEGREES_F) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
364 stmts.append((sensor.uri, ROOM['temperatureF'], |
|
232
4e91f3ec460b
more round() workarounds for mismatching literals not patching themselves out
drewp@bigasterisk.com
parents:
221
diff
changeset
|
365 # see round() note in arduinoNode/devices.py |
|
4e91f3ec460b
more round() workarounds for mismatching literals not patching themselves out
drewp@bigasterisk.com
parents:
221
diff
changeset
|
366 Literal(round(tempF, 2)))) |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
367 except w1thermsensor.core.SensorNotReadyError as e: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
368 log.warning(e) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
369 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
370 return stmts |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
371 except Exception as e: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
372 log.error(e) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
373 os.abort() |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
374 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
375 def watchPrefixes(self): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
376 return [(s.uri, ROOM['temperatureF']) for s in self._sensors] |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
377 |
| 274 | 378 class FilteredValue(object): |
| 379 def __init__(self, setter, | |
| 380 slew=2.0, # step/sec max slew rate | |
| 381 accel=5, # step/sec^2 acceleration | |
| 382 ): | |
| 383 self.setter = setter | |
| 384 self.slew, self.accel = slew, accel | |
| 385 | |
| 386 self.x = None | |
| 387 self.dx = 0 | |
| 388 self.goal = self.x | |
| 389 self.lastStep = 0 | |
| 390 | |
| 391 def set(self, goal): | |
| 392 self.goal = goal | |
| 393 self.step() | |
| 394 | |
| 395 def step(self): | |
| 396 now = time.time() | |
| 397 dt = min(.1, now - self.lastStep) | |
| 398 self.lastStep = now | |
| 399 | |
| 400 if self.x is None: | |
| 401 self.x = self.goal | |
| 402 | |
| 403 if self.goal > self.x: | |
| 404 self.dx = min(self.slew, self.dx + self.accel * dt) | |
| 405 else: | |
| 406 self.dx = max(-self.slew, self.dx - self.accel * dt) | |
| 407 | |
| 408 nextX = self.x + self.dx * dt | |
| 409 if self.x == self.goal or (self.x < self.goal < nextX) or (self.x > self.goal > nextX): | |
| 410 self.x = self.goal | |
| 411 self.dx = 0 | |
| 412 else: | |
| 413 self.x = nextX | |
| 414 reactor.callLater(.05, self.step) | |
| 415 | |
| 416 #print "x= %(x)s dx= %(dx)s goal= %(goal)s" % self.__dict__ | |
| 417 self.setter(self.x) | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
418 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
419 @register |
| 210 | 420 class LedOutput(DeviceType): |
| 421 deviceType = ROOM['LedOutput'] | |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
422 |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
423 def hostStateInit(self): |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
424 self.value = 0 |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
425 if (self.uri, ROOM['fade'], None) in self.graph: |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
426 # incomplete- the object could be fade settings |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
427 self.fv = FilteredValue(self._setPwm) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
428 else: |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
429 _setPwm = self._setPwm |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
430 class Instant(object): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
431 def set(self, goal): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
432 _setPwm(goal) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
433 self.fv = Instant() |
| 289 | 434 self.gamma = float(self.graph.value(self.uri, ROOM['gamma'], default=1)) |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
435 |
| 210 | 436 def setup(self): |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
437 setupPwm(self.pi, self.pinNumber) |
| 210 | 438 |
| 439 def outputPatterns(self): | |
| 440 return [(self.uri, ROOM['brightness'], None)] | |
| 441 | |
| 442 def sendOutput(self, statements): | |
| 443 assert len(statements) == 1 | |
| 444 assert statements[0][:2] == (self.uri, ROOM['brightness']) | |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
445 self.value = float(statements[0][2]) |
| 274 | 446 self.fv.set(self.value) |
| 447 | |
| 448 def _setPwm(self, x): | |
| 324 | 449 v = max(0, min(255, int((x ** self.gamma)* 255))) |
| 210 | 450 self.pi.set_PWM_dutycycle(self.pinNumber, v) |
|
233
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
451 |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
452 def hostStatements(self): |
|
4ebb5cc30002
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp@bigasterisk.com
parents:
232
diff
changeset
|
453 return [(self.uri, ROOM['brightness'], Literal(self.value))] |
| 210 | 454 |
| 455 def outputWidgets(self): | |
| 456 return [{ | |
| 457 'element': 'output-slider', | |
| 458 'min': 0, | |
| 459 'max': 1, | |
| 460 'step': 1 / 255, | |
| 461 'subj': self.uri, | |
| 462 'pred': ROOM['brightness'], | |
| 463 }] | |
| 464 | |
| 465 | |
| 205 | 466 @register |
| 467 class OnboardTemperature(DeviceType): | |
| 468 deviceType = ROOM['OnboardTemperature'] | |
|
243
141079644c45
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp@bigasterisk.com
parents:
233
diff
changeset
|
469 pollPeriod = 10 |
| 205 | 470 @classmethod |
| 471 def findInstances(cls, graph, board, pi): | |
| 259 | 472 log.debug('graph has any connected devices of type OnboardTemperature on %r?', board) |
| 207 | 473 for row in graph.query('''SELECT DISTINCT ?uri WHERE { |
| 205 | 474 ?board :onboardDevice ?uri . |
| 475 ?uri a :OnboardTemperature . | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
476 }''', initBindings=dict(board=board)): |
| 259 | 477 log.debug(' found %s', row.uri) |
| 205 | 478 yield cls(graph, row.uri, pi, pinNumber=None) |
| 479 | |
| 208 | 480 def poll(self): |
| 205 | 481 milliC = open('/sys/class/thermal/thermal_zone0/temp').read().strip() |
| 482 c = float(milliC) / 1000. | |
| 483 f = c * 1.8 + 32 | |
| 484 return [ | |
| 485 (self.uri, ROOM['temperatureF'], Literal(f, datatype=XSD['decimal'])), | |
| 486 ] | |
| 487 | |
| 488 def watchPrefixes(self): | |
| 489 # these uris will become dynamic! see note on watchPrefixes | |
| 490 # about eliminating it. | |
| 491 return [(self.uri, ROOM['temperatureF']), | |
| 492 ] | |
| 259 | 493 |
| 494 @register | |
| 495 class RgbPixels(DeviceType): | |
| 496 """chain of ws2812 rgb pixels on pin GPIO18""" | |
| 497 deviceType = ROOM['RgbPixels'] | |
| 498 | |
| 499 def hostStateInit(self): | |
| 500 px = self.graph.value(self.uri, ROOM['pixels']) | |
| 501 self.pixelUris = list(self.graph.items(px)) | |
| 502 self.values = dict((uri, Literal('#000000')) for uri in self.pixelUris) | |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
503 colorOrder, stripType = self.getColorOrder(self.graph, self.uri) |
| 259 | 504 self.replace = {'ledArray': 'leds_%s' % self.pinNumber, |
| 505 'ledCount': len(self.pixelUris), | |
| 506 'pin': self.pinNumber, | |
| 507 'ledType': 'WS2812', | |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
508 'colorOrder': colorOrder |
| 259 | 509 } |
|
322
f420207c7fb4
switch neopixel libs. lost the r/g/b remapping feature
drewp@bigasterisk.com
parents:
304
diff
changeset
|
510 self.neo = rpi_ws281x.Adafruit_NeoPixel(len(self.values), pin=18) |
| 259 | 511 self.neo.begin() |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
512 |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
513 def getColorOrder(self, graph, uri): |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
514 colorOrder = graph.value(uri, ROOM['colorOrder'], |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
515 default=ROOM['ledColorOrder/RGB']) |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
516 head, tail = str(colorOrder).rsplit('/', 1) |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
517 if head != str(ROOM['ledColorOrder']): |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
518 raise NotImplementedError('%r colorOrder %r' % (uri, colorOrder)) |
|
322
f420207c7fb4
switch neopixel libs. lost the r/g/b remapping feature
drewp@bigasterisk.com
parents:
304
diff
changeset
|
519 stripType = None |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
520 return colorOrder, stripType |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
521 |
| 259 | 522 def _rgbFromHex(self, h): |
| 523 rrggbb = h.lstrip('#') | |
| 524 return [int(x, 16) for x in [rrggbb[0:2], rrggbb[2:4], rrggbb[4:6]]] | |
| 525 | |
| 526 def sendOutput(self, statements): | |
| 527 px, pred, color = statements[0] | |
| 528 if pred != ROOM['color']: | |
| 529 raise ValueError(pred) | |
| 530 rgb = self._rgbFromHex(color) | |
| 531 if px not in self.values: | |
| 532 raise ValueError(px) | |
| 533 self.values[px] = Literal(color) | |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
534 self.neo.setPixelColorRGB(self.pixelUris.index(px), rgb[0], rgb[1], rgb[2]) |
| 259 | 535 self.neo.show() |
| 536 | |
| 537 def hostStatements(self): | |
| 538 return [(uri, ROOM['color'], hexCol) | |
| 539 for uri, hexCol in self.values.items()] | |
| 540 | |
| 541 def outputPatterns(self): | |
| 542 return [(px, ROOM['color'], None) for px in self.pixelUris] | |
| 543 | |
| 544 def outputWidgets(self): | |
| 545 return [{ | |
| 546 'element': 'output-rgb', | |
| 547 'subj': px, | |
| 548 'pred': ROOM['color'], | |
| 549 } for px in self.pixelUris] | |
| 550 | |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
551 @register |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
552 class Lcd8544(DeviceType): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
553 """PCD8544 lcd (nokia 5110)""" |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
554 deviceType = ROOM['RgbStrip'] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
555 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
556 @classmethod |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
557 def findInstances(cls, graph, board, pi): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
558 for row in graph.query(""" |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
559 SELECT DISTINCT ?dev ?din ?clk ?dc ?rst WHERE { |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
560 ?dev a :Lcd8544 . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
561 ?board :hasPin ?dinPin . ?dev :din ?dinPin . ?dinPin :gpioNumber ?din . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
562 ?board :hasPin ?clkPin . ?dev :clk ?clkPin . ?clkPin :gpioNumber ?clk . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
563 ?board :hasPin ?dcPin . ?dev :dc ?dcPin . ?dcPin :gpioNumber ?dc . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
564 ?board :hasPin ?rstPin . ?dev :rst ?rstPin . ?rstPin :gpioNumber ?rst . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
565 } ORDER BY ?dev""", |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
566 initBindings=dict(board=board), |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
567 initNs={'': ROOM}): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
568 log.debug('found lcd %r', row) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
569 yield cls(graph, row.dev, pi, |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
570 int(row.din), int(row.clk), |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
571 int(row.dc), int(row.rst)) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
572 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
573 def __init__(self, graph, uri, pi, din, clk, dc, rst): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
574 super(Lcd8544, self).__init__(graph, uri, pi, None) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
575 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
576 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
577 import RPi.GPIO |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
578 import Adafruit_Nokia_LCD |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
579 import Adafruit_GPIO.SPI |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
580 self.lcd = Adafruit_Nokia_LCD.PCD8544( |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
581 dc=8, rst=7, |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
582 spi=Adafruit_GPIO.SPI.BitBang( |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
583 Adafruit_Nokia_LCD.GPIO.RPiGPIOAdapter(RPi.GPIO), |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
584 sclk=clk, |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
585 mosi=din)) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
586 self.lcd.begin(contrast=60) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
587 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
588 def hostStatements(self): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
589 return [] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
590 return [(self.uri, ROOM['color'], Literal(self.value))] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
591 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
592 def outputPatterns(self): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
593 return [] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
594 return [(self.uri, ROOM['color'], None)] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
595 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
596 def sendOutput(self, statements): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
597 return |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
598 assert len(statements) == 1 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
599 assert statements[0][:2] == (self.uri, ROOM['color']) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
600 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
601 rgb = self._rgbFromHex(statements[0][2]) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
602 self.value = statements[0][2] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
603 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
604 for (i, v) in zip(self.rgb, rgb): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
605 self.pi.set_PWM_dutycycle(i, v) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
606 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
607 def outputWidgets(self): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
608 return [] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
609 return [{ |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
610 'element': 'output-rgb', |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
611 'subj': self.uri, |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
612 'pred': ROOM['color'], |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
613 }] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
614 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
615 |
| 205 | 616 |
| 182 | 617 def makeDevices(graph, board, pi): |
| 618 out = [] | |
| 619 for dt in sorted(_knownTypes, key=lambda cls: cls.__name__): | |
| 620 out.extend(dt.findInstances(graph, board, pi)) | |
| 621 return out | |
| 622 |