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