Mercurial > code > home > repos > homeauto
annotate service/piNode/devices.py @ 382:61f1c529a9b7
etcd port change; pigpio download link change
Ignore-this: cf0ce00b51c41c7d897bf5dbefab7480
| author | drewp@bigasterisk.com |
|---|---|
| date | Fri, 28 Dec 2018 01:56:52 -0800 |
| parents | 38a74c43639c |
| children | 864c8911ae73 |
| 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 |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
21 try: |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
22 import rpi_ws281x |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
23 except ImportError: |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
24 rpi_ws281x = None |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
25 |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
26 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
|
27 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
|
28 # 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
|
29 # 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
|
30 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
|
31 if actual != hz: |
|
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
32 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
|
33 pi.set_PWM_dutycycle(pinNumber, 0) |
| 259 | 34 |
| 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) |
|
345
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
266 import DHT22 |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
267 self.sens = DHT22.sensor(self.pi, self.pinNumber) |
| 367 | 268 self.recentLowTemp = (0, None) # time, temp |
| 269 self.recentPeriodSec = 30 | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
270 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
271 def poll(self): |
|
345
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
272 stmts = set() |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
273 |
| 367 | 274 now = time.time() |
| 275 if self.recentLowTemp[0] < now - self.recentPeriodSec: | |
| 276 self.recentLowTemp = (0, None) | |
| 277 | |
|
345
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
278 if self.sens.staleness() < self.pollPeriod * 2: |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
279 humid, tempC = self.sens.humidity(), self.sens.temperature() |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
280 if humid > -999: |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
281 stmts.add((self.uri, ROOM['humidity'], Literal(round(humid, 2)))) |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
282 else: |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
283 stmts.add((self.uri, RDFS['comment'], Literal('No recent humidity measurement'))) |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
284 if tempC > -999: |
| 367 | 285 # see round() note in arduinoNode/devices.py |
| 286 tempF = round(tempC * 9 / 5 + 32, 2) | |
| 287 stmts.add((self.uri, ROOM['temperatureF'], Literal(tempF))) | |
| 288 if self.recentLowTemp[1] is None or tempF < self.recentLowTemp[1]: | |
| 289 self.recentLowTemp = (now, tempF) | |
|
345
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
290 else: |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
291 stmts.add((self.uri, RDFS['comment'], Literal('No recent temperature measurement'))) |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
292 else: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
293 stmts.add((self.uri, RDFS['comment'], |
|
345
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
294 Literal('No recent DHT response (%.02f sec old)' % self.sens.staleness()))) |
| 367 | 295 |
| 296 if self.recentLowTemp[1] is not None: | |
| 297 stmts.add((self.uri, ROOM['recentLowTemperatureF'], Literal(self.recentLowTemp[1]))) | |
|
345
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
298 |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
299 self.sens.trigger() |
|
d36863e09095
switch to pigpio for reading DHT sensor
drewp@bigasterisk.com
parents:
338
diff
changeset
|
300 |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
301 return stmts |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
302 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
303 def watchPrefixes(self): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
304 return [ |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
305 (self.uri, ROOM['temperatureF']), |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
306 (self.uri, ROOM['humidity']), |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
307 ] |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
308 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
309 @register |
| 244 | 310 class PushbuttonInput(DeviceType): |
| 311 """add a switch to ground; we'll turn on pullup""" | |
| 312 deviceType = ROOM['Pushbutton'] | |
| 313 | |
| 314 def __init__(self, *a, **kw): | |
| 315 DeviceType.__init__(self, *a, **kw) | |
| 316 log.debug("setup switch on %r", self.pinNumber) | |
| 317 self.pi.set_mode(self.pinNumber, pigpio.INPUT) | |
| 318 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
|
319 self.lastClosed = None |
| 262 | 320 self.invert = (self.uri, ROOM['style'], |
| 321 ROOM['inverted']) in self.graph | |
| 244 | 322 |
| 323 def poll(self): | |
| 324 closed = not self.pi.read(self.pinNumber) | |
| 262 | 325 if self.invert: |
| 326 closed = not closed | |
|
251
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
327 |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
328 if self.lastClosed is not None and closed != self.lastClosed: |
| 262 | 329 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
|
330 oneshot = [ |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
331 (self.uri, ROOM['buttonState'], |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
332 ROOM['press'] if closed else ROOM['release']), |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
333 ] |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
334 else: |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
335 oneshot = [] |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
336 self.lastClosed = closed |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
337 |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
338 return {'latest': [ |
| 244 | 339 (self.uri, ROOM['buttonState'], |
| 340 ROOM['pressed'] if closed else ROOM['notPressed']), | |
|
251
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
341 ], |
|
254df9f881a6
start sending oneshot events from some devices
drewp@bigasterisk.com
parents:
244
diff
changeset
|
342 'oneshot':oneshot} |
| 244 | 343 |
| 344 def watchPrefixes(self): | |
| 345 return [ | |
| 346 (self.uri, ROOM['buttonState']), | |
| 347 ] | |
| 348 | |
| 349 @register | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
350 class OneWire(DeviceType): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
351 """ |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
352 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
|
353 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
|
354 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
|
355 """ |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
356 deviceType = ROOM['OneWire'] |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
357 pollPeriod = 2 |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
358 # 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
|
359 def __init__(self, *a, **kw): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
360 DeviceType.__init__(self, *a, **kw) |
| 381 | 361 import w1thermsensor |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
362 log.info("scan for w1 devices") |
| 381 | 363 self.SensorNotReadyError = w1thermsensor.core.SensorNotReadyError |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
364 self._sensors = w1thermsensor.W1ThermSensor.get_available_sensors() |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
365 for s in self._sensors: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
366 # Something looks different about these ids |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
367 # ('000003a5a94c') vs the ones I get from arduino |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
368 # ('2813bea50300003d'). Not sure if I'm parsing them |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
369 # differently or what. |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
370 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
|
371 log.info(' found temperature sensor %s' % s.uri) |
|
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 def poll(self): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
374 try: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
375 stmts = [] |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
376 for sensor in self._sensors: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
377 stmts.append((self.uri, ROOM['connectedTo'], sensor.uri)) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
378 try: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
379 tempF = sensor.get_temperature(sensor.DEGREES_F) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
380 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
|
381 # 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
|
382 Literal(round(tempF, 2)))) |
| 381 | 383 except self.SensorNotReadyError as e: |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
384 log.warning(e) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
385 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
386 return stmts |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
387 except Exception as e: |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
388 log.error(e) |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
389 os.abort() |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
390 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
391 def watchPrefixes(self): |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
392 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
|
393 |
| 274 | 394 class FilteredValue(object): |
| 395 def __init__(self, setter, | |
| 396 slew=2.0, # step/sec max slew rate | |
| 397 accel=5, # step/sec^2 acceleration | |
| 398 ): | |
| 399 self.setter = setter | |
| 400 self.slew, self.accel = slew, accel | |
| 401 | |
| 402 self.x = None | |
| 403 self.dx = 0 | |
| 404 self.goal = self.x | |
| 405 self.lastStep = 0 | |
| 406 | |
| 407 def set(self, goal): | |
| 408 self.goal = goal | |
| 409 self.step() | |
| 410 | |
| 411 def step(self): | |
| 412 now = time.time() | |
| 413 dt = min(.1, now - self.lastStep) | |
| 414 self.lastStep = now | |
| 415 | |
| 416 if self.x is None: | |
| 417 self.x = self.goal | |
| 418 | |
| 419 if self.goal > self.x: | |
| 420 self.dx = min(self.slew, self.dx + self.accel * dt) | |
| 421 else: | |
| 422 self.dx = max(-self.slew, self.dx - self.accel * dt) | |
| 423 | |
| 424 nextX = self.x + self.dx * dt | |
| 425 if self.x == self.goal or (self.x < self.goal < nextX) or (self.x > self.goal > nextX): | |
| 426 self.x = self.goal | |
| 427 self.dx = 0 | |
| 428 else: | |
| 429 self.x = nextX | |
| 430 reactor.callLater(.05, self.step) | |
| 431 | |
| 432 #print "x= %(x)s dx= %(dx)s goal= %(goal)s" % self.__dict__ | |
| 433 self.setter(self.x) | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
434 |
|
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
435 @register |
| 210 | 436 class LedOutput(DeviceType): |
| 437 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
|
438 |
|
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
|
439 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
|
440 self.value = 0 |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
441 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
|
442 # 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
|
443 self.fv = FilteredValue(self._setPwm) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
444 else: |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
445 _setPwm = self._setPwm |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
446 class Instant(object): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
447 def set(self, goal): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
448 _setPwm(goal) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
449 self.fv = Instant() |
| 289 | 450 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
|
451 |
| 210 | 452 def setup(self): |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
453 setupPwm(self.pi, self.pinNumber) |
| 210 | 454 |
| 455 def outputPatterns(self): | |
| 456 return [(self.uri, ROOM['brightness'], None)] | |
| 457 | |
| 458 def sendOutput(self, statements): | |
| 459 assert len(statements) == 1 | |
| 460 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
|
461 self.value = float(statements[0][2]) |
| 274 | 462 self.fv.set(self.value) |
| 463 | |
| 464 def _setPwm(self, x): | |
| 324 | 465 v = max(0, min(255, int((x ** self.gamma)* 255))) |
| 210 | 466 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
|
467 |
|
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
|
468 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
|
469 return [(self.uri, ROOM['brightness'], Literal(self.value))] |
| 210 | 470 |
| 471 def outputWidgets(self): | |
| 472 return [{ | |
| 473 'element': 'output-slider', | |
| 474 'min': 0, | |
| 475 'max': 1, | |
| 476 'step': 1 / 255, | |
| 477 'subj': self.uri, | |
| 478 'pred': ROOM['brightness'], | |
| 479 }] | |
| 480 | |
| 481 | |
| 205 | 482 @register |
| 483 class OnboardTemperature(DeviceType): | |
| 484 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
|
485 pollPeriod = 10 |
| 205 | 486 @classmethod |
| 487 def findInstances(cls, graph, board, pi): | |
| 259 | 488 log.debug('graph has any connected devices of type OnboardTemperature on %r?', board) |
| 207 | 489 for row in graph.query('''SELECT DISTINCT ?uri WHERE { |
| 205 | 490 ?board :onboardDevice ?uri . |
| 491 ?uri a :OnboardTemperature . | |
|
221
666e0e756ce6
piNode support for temp sensors. proper hostname lookup
drewp@bigasterisk.com
parents:
220
diff
changeset
|
492 }''', initBindings=dict(board=board)): |
| 259 | 493 log.debug(' found %s', row.uri) |
| 205 | 494 yield cls(graph, row.uri, pi, pinNumber=None) |
| 495 | |
| 208 | 496 def poll(self): |
| 205 | 497 milliC = open('/sys/class/thermal/thermal_zone0/temp').read().strip() |
| 498 c = float(milliC) / 1000. | |
| 499 f = c * 1.8 + 32 | |
| 500 return [ | |
| 501 (self.uri, ROOM['temperatureF'], Literal(f, datatype=XSD['decimal'])), | |
| 502 ] | |
| 503 | |
| 504 def watchPrefixes(self): | |
| 505 # these uris will become dynamic! see note on watchPrefixes | |
| 506 # about eliminating it. | |
| 507 return [(self.uri, ROOM['temperatureF']), | |
| 508 ] | |
| 259 | 509 |
| 510 @register | |
| 511 class RgbPixels(DeviceType): | |
| 512 """chain of ws2812 rgb pixels on pin GPIO18""" | |
| 513 deviceType = ROOM['RgbPixels'] | |
| 514 | |
| 515 def hostStateInit(self): | |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
516 self.anim = RgbPixelsAnimation(self.graph, self.uri, self.updateOutput) |
| 368 | 517 log.debug('%s maxIndex = %s', self.uri, self.anim.maxIndex()) |
| 518 self.neo = rpi_ws281x.Adafruit_NeoPixel(self.anim.maxIndex() + 1, pin=18) | |
| 259 | 519 self.neo.begin() |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
520 |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
521 colorOrder, stripType = self.anim.getColorOrder(self.graph, self.uri) |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
522 |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
523 def sendOutput(self, statements): |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
524 self.anim.onStatements(statements) |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
525 |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
526 def updateOutput(self): |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
527 if 0: |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
528 for _, _, sg in self.anim.groups.values(): |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
529 print sg.uri, sg.current |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
530 print list(self.anim.currentColors()) |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
531 return |
|
266
1ae78fe6f36e
neopixel lib change. factor out pwm setup and try another pwm rate
drewp@bigasterisk.com
parents:
262
diff
changeset
|
532 |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
533 for idx, (r, g, b) in self.anim.currentColors(): |
| 368 | 534 log.debug('out color %s (%s,%s,%s)', idx, r, g, b) |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
535 self.neo.setPixelColorRGB(idx, r, g, b) |
| 259 | 536 self.neo.show() |
| 537 | |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
538 def poll(self): |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
539 self.anim.step() |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
540 return [] |
|
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
541 |
| 259 | 542 def hostStatements(self): |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
543 return self.anim.hostStatements() |
| 259 | 544 |
| 545 def outputPatterns(self): | |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
546 return self.anim.outputPatterns() |
| 259 | 547 |
| 548 def outputWidgets(self): | |
|
338
f64e20d3407e
RgbPixelsAnimation and docker build updates
drewp@bigasterisk.com
parents:
331
diff
changeset
|
549 return self.anim.outputWidgets() |
| 259 | 550 |
|
304
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
551 @register |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
552 class Lcd8544(DeviceType): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
553 """PCD8544 lcd (nokia 5110)""" |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
554 deviceType = ROOM['RgbStrip'] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
555 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
556 @classmethod |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
557 def findInstances(cls, graph, board, pi): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
558 for row in graph.query(""" |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
559 SELECT DISTINCT ?dev ?din ?clk ?dc ?rst WHERE { |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
560 ?dev a :Lcd8544 . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
561 ?board :hasPin ?dinPin . ?dev :din ?dinPin . ?dinPin :gpioNumber ?din . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
562 ?board :hasPin ?clkPin . ?dev :clk ?clkPin . ?clkPin :gpioNumber ?clk . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
563 ?board :hasPin ?dcPin . ?dev :dc ?dcPin . ?dcPin :gpioNumber ?dc . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
564 ?board :hasPin ?rstPin . ?dev :rst ?rstPin . ?rstPin :gpioNumber ?rst . |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
565 } ORDER BY ?dev""", |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
566 initBindings=dict(board=board), |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
567 initNs={'': ROOM}): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
568 log.debug('found lcd %r', row) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
569 yield cls(graph, row.dev, pi, |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
570 int(row.din), int(row.clk), |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
571 int(row.dc), int(row.rst)) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
572 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
573 def __init__(self, graph, uri, pi, din, clk, dc, rst): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
574 super(Lcd8544, self).__init__(graph, uri, pi, None) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
575 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
576 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
577 import RPi.GPIO |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
578 import Adafruit_Nokia_LCD |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
579 import Adafruit_GPIO.SPI |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
580 self.lcd = Adafruit_Nokia_LCD.PCD8544( |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
581 dc=8, rst=7, |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
582 spi=Adafruit_GPIO.SPI.BitBang( |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
583 Adafruit_Nokia_LCD.GPIO.RPiGPIOAdapter(RPi.GPIO), |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
584 sclk=clk, |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
585 mosi=din)) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
586 self.lcd.begin(contrast=60) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
587 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
588 def hostStatements(self): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
589 return [] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
590 return [(self.uri, ROOM['color'], Literal(self.value))] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
591 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
592 def outputPatterns(self): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
593 return [] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
594 return [(self.uri, ROOM['color'], None)] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
595 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
596 def sendOutput(self, statements): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
597 return |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
598 assert len(statements) == 1 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
599 assert statements[0][:2] == (self.uri, ROOM['color']) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
600 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
601 rgb = self._rgbFromHex(statements[0][2]) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
602 self.value = statements[0][2] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
603 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
604 for (i, v) in zip(self.rgb, rgb): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
605 self.pi.set_PWM_dutycycle(i, v) |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
606 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
607 def outputWidgets(self): |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
608 return [] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
609 return [{ |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
610 'element': 'output-rgb', |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
611 'subj': self.uri, |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
612 'pred': ROOM['color'], |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
613 }] |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
614 |
|
e7cbf250188a
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp@bigasterisk.com
parents:
290
diff
changeset
|
615 |
| 205 | 616 |
| 182 | 617 def makeDevices(graph, board, pi): |
| 618 out = [] | |
| 619 for dt in sorted(_knownTypes, key=lambda cls: cls.__name__): | |
| 620 out.extend(dt.findInstances(graph, board, pi)) | |
| 621 return out | |
| 622 |