Mercurial > code > home > repos > homeauto

annotate service/piNode/devices.py @ 1064:d29b9212c4c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add support for rgb leds on rpi Ignore-this: cf43ab04f853069450e0f9d42786ea64 darcs-hash:642ac873bfd79da11b39c66f659c5898d41ce9bc
author drewp <drewp@bigasterisk.com>
date Mon, 21 Mar 2016 04:24:31 -0700
parents faf1f8677a91
children 9e388c3f032c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
1 from __future__ import division
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
2
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
3 import time, logging, os
1048
f3c7f617c335 piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents: 1038
diff changeset
4 from rdflib import Namespace, URIRef, Literal
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
5
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
6 try:
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
7 import pigpio
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
8 except ImportError:
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
9 pigpio = None
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
10 import w1thermsensor
1064
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
11 try:
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
12 import NeoPixel
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
13 except ImportError:
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
14 NeoPixel = None
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
15
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
16 import sys
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
17
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
18 log = logging.getLogger()
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
19 ROOM = Namespace('http://projects.bigasterisk.com/room/')
1014
d27abd3b6c70 namespace
drewp <drewp@bigasterisk.com>
parents: 1013
diff changeset
20 XSD = Namespace('http://www.w3.org/2001/XMLSchema#')
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
21 RDFS = Namespace('http://www.w3.org/2000/01/rdf-schema#')
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
22
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
23 class DeviceType(object):
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
24 deviceType = NotImplementedError
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
25 @classmethod
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
26 def findInstances(cls, graph, board, pi):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
27 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
28 return any number of instances of this class for all the separately
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
29 controlled devices on the board. Two LEDS makes two instances,
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
30 but two sensors on the same onewire bus makes only one device
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
31 (which yields more statements).
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
32 """
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
33 log.debug("graph has any connected devices of type %s?", cls.deviceType)
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
34 for row in graph.query("""SELECT ?dev ?gpioNumber WHERE {
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
35 ?board :hasPin ?pin .
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
36 ?pin :gpioNumber ?gpioNumber;
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
37 :connectedTo ?dev .
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
38 ?dev a ?thisType .
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
39 } ORDER BY ?dev""",
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
40 initBindings=dict(board=board,
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
41 thisType=cls.deviceType)):
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
42 yield cls(graph, row.dev, pi, int(row.gpioNumber))
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
43
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
44 def __init__(self, graph, uri, pi, pinNumber):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
45 self.graph, self.uri, self.pi = graph, uri, pi
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
46 self.pinNumber = pinNumber
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
47 self.hostStateInit()
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
48
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
49 def hostStateInit(self):
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
50 """
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
51 If you don't want to use __init__, you can use this to set up
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
52 whatever storage you might need for hostStatements
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
53 """
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
54
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
55 def description(self):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
56 return {
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
57 'uri': self.uri,
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
58 'className': self.__class__.__name__,
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
59 'pinNumber': getattr(self, 'pinNumber', None),
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
60 'outputPatterns': self.outputPatterns(),
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
61 'watchPrefixes': self.watchPrefixes(),
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
62 'outputWidgets': self.outputWidgets(),
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
63 }
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
64
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
65 def hostStatements(self):
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
66 """
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
67 Like readFromPoll but these statements come from the host-side
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
68 python code, not the connected device. Include output state
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
69 (e.g. light brightness) if its master version is in this
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
70 object. This method is called on /graph requests so it should
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
71 be fast.
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
72 """
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
73 return []
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
74
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
75 def watchPrefixes(self):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
76 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
77 subj,pred pairs of the statements that might be returned from
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
78 readFromPoll, so the dashboard knows what it should
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
79 watch. This should be eliminated, as the dashboard should just
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
80 always watch the whole tree of statements starting self.uri
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
81 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
82 return []
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
83
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
84 def poll(self):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
85 return [] # statements
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
86
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
87 def outputPatterns(self):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
88 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
89 Triple patterns, using None as a wildcard, that should be routed
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
90 to sendOutput
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
91 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
92 return []
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
93
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
94 def outputWidgets(self):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
95 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
96 structs to make output widgets on the dashboard. ~1 of these per
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
97 handler you have in sendOutput
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
98 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
99 return []
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
100
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
101 def sendOutput(self, statements):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
102 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
103 If we got statements that match this class's outputPatterns, this
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
104 will be called with the statements that matched.
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
105
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
106 Todo: it would be fine to read back confirmations or
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
107 whatever. Just need a way to collect them into graph statements.
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
108 """
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
109 raise NotImplementedError
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
110
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
111 _knownTypes = set()
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
112 def register(deviceType):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
113 _knownTypes.add(deviceType)
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
114 return deviceType
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
115
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
116 @register
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
117 class MotionSensorInput(DeviceType):
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
118 # compare motion sensor lib at http://pythonhosted.org/gpiozero/inputs/
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
119 # which is a bit fancier
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
120 deviceType = ROOM['MotionSensor']
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
121
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
122 def setup(self):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
123 self.pi.set_mode(17, pigpio.INPUT)
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
124 self.pi.set_pull_up_down(17, pigpio.PUD_DOWN)
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
125
1059
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
126 def hostStateInit(self):
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
127 self.lastRead = None
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
128
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
129 def poll(self):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
130 motion = self.pi.read(17)
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
131
1059
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
132 oneshot = []
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
133 if self.lastRead is not None and motion != self.lastRead:
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
134 oneshot = [(self.uri, ROOM['sees'], ROOM['motionStart'])]
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
135 self.lastRead = motion
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
136
1056
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
137 return {'latest': [
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
138 (self.uri, ROOM['sees'],
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
139 ROOM['motion'] if motion else ROOM['noMotion']),
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
140 self.recentMotionStatement(motion),
1059
faf1f8677a91 pi device support for motionStart edge trigger
drewp <drewp@bigasterisk.com>
parents: 1056
diff changeset
141 ], 'oneshot': oneshot}
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
142
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
143 def recentMotionStatement(self, motion):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
144 if not hasattr(self, 'lastMotionTime'):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
145 self.lastMotionTime = 0
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
146 now = time.time()
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
147 if motion:
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
148 self.lastMotionTime = now
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
149 recentMotion = now - self.lastMotionTime < 60 * 10
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
150 return (self.uri, ROOM['seesRecently'],
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
151 ROOM['motion'] if recentMotion else ROOM['noMotion'])
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
152
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
153 def watchPrefixes(self):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
154 return [
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
155 (self.uri, ROOM['sees']),
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
156 (self.uri, ROOM['seesRecently']),
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
157 ]
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
158
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
159
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
160 @register
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
161 class RgbStrip(DeviceType):
1025
f58b5536f683 ipv6 and some refactor
drewp <drewp@bigasterisk.com>
parents: 1015
diff changeset
162 """3 PWMs for r/g/b on a strip"""
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
163 # pigpio daemon is working fine, but
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
164 # https://github.com/RPi-Distro/python-gpiozero/blob/59ba7154c5918745ac894ea03503667d6473c760/gpiozero/output_devices.py#L213
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
165 # can also apparently do PWM
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
166 deviceType = ROOM['RgbStrip']
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
167
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
168 @classmethod
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
169 def findInstances(cls, graph, board, pi):
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
170 for row in graph.query("""SELECT DISTINCT ?dev ?r ?g ?b WHERE {
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
171 ?board
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
172 :hasPin ?rpin;
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
173 :hasPin ?gpin;
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
174 :hasPin ?bpin .
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
175 ?dev a :RgbStrip;
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
176 :redChannel ?rpin;
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
177 :greenChannel ?gpin;
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
178 :blueChannel ?bpin .
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
179 ?rpin :gpioNumber ?r .
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
180 ?gpin :gpioNumber ?g .
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
181 ?bpin :gpioNumber ?b .
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
182 } ORDER BY ?dev""",
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
183 initBindings=dict(board=board),
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
184 initNs={'': ROOM}):
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
185 log.debug('found rgb %r', row)
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
186 yield cls(graph, row.dev, pi, row.r, row.g, row.b)
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
187
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
188 def __init__(self, graph, uri, pi, r, g, b):
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
189 self.graph, self.uri, self.pi = graph, uri, pi
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
190 self.rgb = map(int, [r, g, b])
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
191 self.value = '#000000'
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
192
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
193 def setup(self):
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
194 for i in self.rgb:
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
195 self.pi.set_mode(i, pigpio.OUTPUT)
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
196 self.pi.set_PWM_frequency(i, 200)
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
197 self.pi.set_PWM_dutycycle(i, 0)
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
198
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
199 def hostStatements(self):
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
200 return [(self.uri, ROOM['color'], Literal(self.value))]
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
201
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
202 def outputPatterns(self):
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
203 return [(self.uri, ROOM['color'], None)]
1025
f58b5536f683 ipv6 and some refactor
drewp <drewp@bigasterisk.com>
parents: 1015
diff changeset
204
f58b5536f683 ipv6 and some refactor
drewp <drewp@bigasterisk.com>
parents: 1015
diff changeset
205 def _rgbFromHex(self, h):
f58b5536f683 ipv6 and some refactor
drewp <drewp@bigasterisk.com>
parents: 1015
diff changeset
206 rrggbb = h.lstrip('#')
f58b5536f683 ipv6 and some refactor
drewp <drewp@bigasterisk.com>
parents: 1015
diff changeset
207 return [int(x, 16) for x in [rrggbb[0:2], rrggbb[2:4], rrggbb[4:6]]]
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
208
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
209 def sendOutput(self, statements):
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
210 assert len(statements) == 1
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
211 assert statements[0][:2] == (self.uri, ROOM['color'])
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
212
1025
f58b5536f683 ipv6 and some refactor
drewp <drewp@bigasterisk.com>
parents: 1015
diff changeset
213 rgb = self._rgbFromHex(statements[0][2])
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
214 self.value = statements[0][2]
988
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
215
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
216 for (i, v) in zip(self.rgb, rgb):
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
217 self.pi.set_PWM_dutycycle(i, v)
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
218
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
219 def outputWidgets(self):
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
220 return [{
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
221 'element': 'output-rgb',
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
222 'subj': self.uri,
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
223 'pred': ROOM['color'],
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
224 }]
63c172316239 get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents: 987
diff changeset
225
1015
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
226
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
227 @register
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
228 class TempHumidSensor(DeviceType):
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
229 deviceType = ROOM['TempHumidSensor']
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
230
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
231 def __init__(self, *a, **kw):
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
232 DeviceType.__init__(self, *a, **kw)
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
233 sys.path.append('/opt/pigpio/EXAMPLES/Python/DHT22_AM2302_SENSOR')
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
234 import DHT22
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
235 self.sensor = DHT22.sensor(self.pi, self.pinNumber)
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
236
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
237 def poll(self):
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
238 self.sensor.trigger()
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
239 humid, tempC = self.sensor.humidity(), self.sensor.temperature()
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
240
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
241 stmts = set()
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
242 if humid is not None:
1037
8d1a8a96e895 more round() workarounds for mismatching literals not patching themselves out
drewp <drewp@bigasterisk.com>
parents: 1026
diff changeset
243 stmts.add((self.uri, ROOM['humidity'], Literal(round(humid, 2))))
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
244 else:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
245 stmts.add((self.uri, RDFS['comment'],
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
246 Literal('DHT read returned None')))
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
247 if tempC is not None:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
248 stmts.add((self.uri, ROOM['temperatureF'],
1037
8d1a8a96e895 more round() workarounds for mismatching literals not patching themselves out
drewp <drewp@bigasterisk.com>
parents: 1026
diff changeset
249 # see round() note in arduinoNode/devices.py
8d1a8a96e895 more round() workarounds for mismatching literals not patching themselves out
drewp <drewp@bigasterisk.com>
parents: 1026
diff changeset
250 Literal(round(tempC * 9 / 5 + 32, 2))))
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
251 else:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
252 stmts.add((self.uri, RDFS['comment'],
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
253 Literal('DHT read returned None')))
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
254 return stmts
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
255
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
256 def watchPrefixes(self):
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
257 return [
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
258 (self.uri, ROOM['temperatureF']),
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
259 (self.uri, ROOM['humidity']),
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
260 ]
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
261
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
262 @register
1049
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
263 class PushbuttonInput(DeviceType):
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
264 """add a switch to ground; we'll turn on pullup"""
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
265 deviceType = ROOM['Pushbutton']
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
266
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
267 def __init__(self, *a, **kw):
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
268 DeviceType.__init__(self, *a, **kw)
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
269 log.debug("setup switch on %r", self.pinNumber)
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
270 self.pi.set_mode(self.pinNumber, pigpio.INPUT)
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
271 self.pi.set_pull_up_down(self.pinNumber, pigpio.PUD_UP)
1056
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
272 self.lastClosed = None
1049
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
273
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
274 def poll(self):
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
275 closed = not self.pi.read(self.pinNumber)
1056
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
276
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
277 if self.lastClosed is not None and closed != self.lastClosed:
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
278 oneshot = [
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
279 (self.uri, ROOM['buttonState'],
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
280 ROOM['press'] if closed else ROOM['release']),
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
281 ]
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
282 else:
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
283 oneshot = []
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
284 self.lastClosed = closed
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
285
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
286 return {'latest': [
1049
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
287 (self.uri, ROOM['buttonState'],
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
288 ROOM['pressed'] if closed else ROOM['notPressed']),
1056
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
289 ],
d2007482aec5 start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents: 1049
diff changeset
290 'oneshot':oneshot}
1049
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
291
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
292 def watchPrefixes(self):
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
293 return [
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
294 (self.uri, ROOM['buttonState']),
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
295 ]
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
296
96f0a8b345aa pi pushbutton device
drewp <drewp@bigasterisk.com>
parents: 1048
diff changeset
297 @register
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
298 class OneWire(DeviceType):
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
299 """
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
300 Also see /my/proj/ansible/roles/raspi_io_node/tasks/main.yml for
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
301 some system config that contains the pin number that you want to
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
302 use for onewire. The pin number in this config is currently ignored.
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
303 """
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
304 deviceType = ROOM['OneWire']
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
305 # deliberately written like arduinoNode's one for an easier merge.
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
306 def __init__(self, *a, **kw):
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
307 DeviceType.__init__(self, *a, **kw)
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
308 log.info("scan for w1 devices")
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
309 self._sensors = w1thermsensor.W1ThermSensor.get_available_sensors()
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
310 for s in self._sensors:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
311 # Something looks different about these ids
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
312 # ('000003a5a94c') vs the ones I get from arduino
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
313 # ('2813bea50300003d'). Not sure if I'm parsing them
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
314 # differently or what.
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
315 s.uri = URIRef(os.path.join(self.uri, 'dev-%s' % s.id))
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
316 log.info(' found temperature sensor %s' % s.uri)
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
317
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
318 def poll(self):
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
319 try:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
320 stmts = []
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
321 for sensor in self._sensors:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
322 stmts.append((self.uri, ROOM['connectedTo'], sensor.uri))
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
323 try:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
324 tempF = sensor.get_temperature(sensor.DEGREES_F)
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
325 stmts.append((sensor.uri, ROOM['temperatureF'],
1037
8d1a8a96e895 more round() workarounds for mismatching literals not patching themselves out
drewp <drewp@bigasterisk.com>
parents: 1026
diff changeset
326 # see round() note in arduinoNode/devices.py
8d1a8a96e895 more round() workarounds for mismatching literals not patching themselves out
drewp <drewp@bigasterisk.com>
parents: 1026
diff changeset
327 Literal(round(tempF, 2))))
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
328 except w1thermsensor.core.SensorNotReadyError as e:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
329 log.warning(e)
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
330
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
331 return stmts
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
332 except Exception as e:
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
333 log.error(e)
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
334 os.abort()
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
335
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
336 def watchPrefixes(self):
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
337 return [(s.uri, ROOM['temperatureF']) for s in self._sensors]
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
338
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
339
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
340 @register
1015
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
341 class LedOutput(DeviceType):
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
342 deviceType = ROOM['LedOutput']
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
343
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
344 def hostStateInit(self):
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
345 self.value = 0
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
346
1015
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
347 def setup(self):
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
348 self.pi.set_mode(self.pinNumber, pigpio.OUTPUT)
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
349 self.pi.set_PWM_frequency(self.pinNumber, 200)
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
350 self.pi.set_PWM_dutycycle(self.pinNumber, 0)
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
351
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
352 def outputPatterns(self):
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
353 return [(self.uri, ROOM['brightness'], None)]
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
354
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
355 def sendOutput(self, statements):
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
356 assert len(statements) == 1
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
357 assert statements[0][:2] == (self.uri, ROOM['brightness'])
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
358 self.value = float(statements[0][2])
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
359 v = int(self.value * 255)
1015
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
360 self.pi.set_PWM_dutycycle(self.pinNumber, v)
1038
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
361
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
362 def hostStatements(self):
ffe6a00c6cef server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents: 1037
diff changeset
363 return [(self.uri, ROOM['brightness'], Literal(self.value))]
1015
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
364
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
365 def outputWidgets(self):
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
366 return [{
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
367 'element': 'output-slider',
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
368 'min': 0,
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
369 'max': 1,
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
370 'step': 1 / 255,
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
371 'subj': self.uri,
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
372 'pred': ROOM['brightness'],
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
373 }]
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
374
4d80718a47e5 ledoutput support for piNode
drewp <drewp@bigasterisk.com>
parents: 1014
diff changeset
375
1010
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
376 @register
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
377 class OnboardTemperature(DeviceType):
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
378 deviceType = ROOM['OnboardTemperature']
1048
f3c7f617c335 piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents: 1038
diff changeset
379 pollPeriod = 10
1010
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
380 @classmethod
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
381 def findInstances(cls, graph, board, pi):
1064
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
382 log.debug('graph has any connected devices of type OnboardTemperature on %r?', board)
1012
d125a8c90f6c fix temp init
drewp <drewp@bigasterisk.com>
parents: 1010
diff changeset
383 for row in graph.query('''SELECT DISTINCT ?uri WHERE {
1010
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
384 ?board :onboardDevice ?uri .
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
385 ?uri a :OnboardTemperature .
1026
8e075449ba0a piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents: 1025
diff changeset
386 }''', initBindings=dict(board=board)):
1064
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
387 log.debug(' found %s', row.uri)
1010
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
388 yield cls(graph, row.uri, pi, pinNumber=None)
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
389
1013
156dda05d811 pi version just uses poll()
drewp <drewp@bigasterisk.com>
parents: 1012
diff changeset
390 def poll(self):
1010
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
391 milliC = open('/sys/class/thermal/thermal_zone0/temp').read().strip()
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
392 c = float(milliC) / 1000.
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
393 f = c * 1.8 + 32
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
394 return [
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
395 (self.uri, ROOM['temperatureF'], Literal(f, datatype=XSD['decimal'])),
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
396 ]
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
397
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
398 def watchPrefixes(self):
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
399 # these uris will become dynamic! see note on watchPrefixes
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
400 # about eliminating it.
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
401 return [(self.uri, ROOM['temperatureF']),
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
402 ]
1064
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
403
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
404 @register
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
405 class RgbPixels(DeviceType):
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
406 """chain of ws2812 rgb pixels on pin GPIO18"""
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
407 deviceType = ROOM['RgbPixels']
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
408
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
409 def hostStateInit(self):
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
410 px = self.graph.value(self.uri, ROOM['pixels'])
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
411 self.pixelUris = list(self.graph.items(px))
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
412 self.values = dict((uri, Literal('#000000')) for uri in self.pixelUris)
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
413 self.replace = {'ledArray': 'leds_%s' % self.pinNumber,
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
414 'ledCount': len(self.pixelUris),
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
415 'pin': self.pinNumber,
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
416 'ledType': 'WS2812',
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
417 }
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
418 self.neo = NeoPixel.NeoPixel(len(self.values))
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
419 self.neo.begin()
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
420
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
421 def _rgbFromHex(self, h):
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
422 rrggbb = h.lstrip('#')
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
423 return [int(x, 16) for x in [rrggbb[0:2], rrggbb[2:4], rrggbb[4:6]]]
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
424
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
425 def sendOutput(self, statements):
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
426 px, pred, color = statements[0]
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
427 if pred != ROOM['color']:
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
428 raise ValueError(pred)
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
429 rgb = self._rgbFromHex(color)
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
430 if px not in self.values:
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
431 raise ValueError(px)
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
432 self.values[px] = Literal(color)
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
433 self.neo.setPixelColor(self.pixelUris.index(px), rgb[0], rgb[1], rgb[2])
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
434 self.neo.show()
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
435
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
436 def hostStatements(self):
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
437 return [(uri, ROOM['color'], hexCol)
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
438 for uri, hexCol in self.values.items()]
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
439
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
440 def outputPatterns(self):
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
441 return [(px, ROOM['color'], None) for px in self.pixelUris]
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
442
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
443 def outputWidgets(self):
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
444 return [{
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
445 'element': 'output-rgb',
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
446 'subj': px,
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
447 'pred': ROOM['color'],
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
448 } for px in self.pixelUris]
d29b9212c4c5 add support for rgb leds on rpi
drewp <drewp@bigasterisk.com>
parents: 1059
diff changeset
449
1010
f2d05b425dfa piNode onboard temp
drewp <drewp@bigasterisk.com>
parents: 988
diff changeset
450
987
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
451 def makeDevices(graph, board, pi):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
452 out = []
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
453 for dt in sorted(_knownTypes, key=lambda cls: cls.__name__):
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
454 out.extend(dt.findInstances(graph, board, pi))
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
455 return out
cc79d092e136 start pinode
drewp <drewp@bigasterisk.com>
parents:
diff changeset
456