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