homeauto: service/arduinoNode/devices.py comparison

button :press oneshot Ignore-this: 683ebd47640eb29f6af4da4b352e304f darcs-hash:a6ef95d08deccb78307cc06e642755be24ee0c3e

comparison

equal deleted inserted replaced

-:ef635e9b9dce
+:6ab7a933c2a8
 @register
 class PushbuttonInput(DeviceType):
 """add a switch to ground; we'll turn on pullup"""
 deviceType = ROOM['Pushbutton']
+def __init__(self, graph, uri, pinNumber):
+DeviceType.__init__(self, graph, uri, pinNumber)
+self.lastClosed = None
 def generateSetupCode(self):
 return 'pinMode(%(pin)d, INPUT); digitalWrite(%(pin)d, HIGH);' % {
 'pin': self.pinNumber,
 }
 def readFromPoll(self, read):
 b = read(1)
 if b not in '01':
 raise ValueError('unexpected response %r' % b)
-motion = b == '1'
+closed = b == '0'
-#and exactly once for the transition
+if self.lastClosed is not None and closed != self.lastClosed:
-return [
+oneshot = [
+(self.uri, ROOM['buttonState'],
+ROOM['press'] if closed else ROOM['release']),
+]
+else:
+oneshot = []
+self.lastClosed = closed
+return {'latest': [
 (self.uri, ROOM['buttonState'],
-ROOM['pressed'] if motion else ROOM['notPressed']),
+ROOM['pressed'] if closed else ROOM['notPressed']),
-]
+],
+'oneshot': oneshot}
 def watchPrefixes(self):
 return [
 (self.uri, ROOM['buttonState']),
 ]

Mercurial > code > home > repos > homeauto