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