Mercurial > code > home > repos > homeauto

changeset 1371:293d328a55d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
match esp hostname in py code Ignore-this: 57f2db842b5935faad0214bac52f5adc darcs-hash:345acba508ac57afc87c9e1b0e8e88e34c95bdbc
author drewp <drewp@bigasterisk.com>
date Sun, 05 May 2019 22:44:35 -0700
parents a6902e4587f6
children 26dd28671f70
files service/frontDoorLock/front_door_lock.py
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/service/frontDoorLock/front_door_lock.py	Sun May 05 22:43:14 2019 -0700
+++ b/service/frontDoorLock/front_door_lock.py	Sun May 05 22:44:35 2019 -0700
@@ -21,6 +21,7 @@
 ROOM = Namespace('http://projects.bigasterisk.com/room/')
 
 ctx = ROOM['frontDoorControl']
+espName = b'frontdoorlock' # from door.yaml
 
 def rdfGraphBody(body, headers):
     g = Graph()
@@ -70,7 +71,7 @@
                 self.settings.autoLock.onUnlockedStmt()
             if stmt[2] == ROOM['locked']:
                 self.settings.autoLock.onLockedStmt()
-            self.settings.mqtt.publish(b"frontdoor/switch/strike/command",
+            self.settings.mqtt.publish(espName + b"/switch/strike/command",
                                        mqttMessageFromState(stmt[2]))
             return
         log.warn("ignoring %s", stmt)
@@ -87,7 +88,7 @@
 
     def relock(self):
         log.info('autolock is up: requesting lock')
-        self.mqtt.publish(b"frontdoor/switch/strike/command",
+        self.mqtt.publish(espName + b"/switch/strike/command",
                           mqttMessageFromState(ROOM['locked']))
 
     def reportTimes(self, unlockedFor):
@@ -149,7 +150,7 @@
         if body['addr'] == 'zz:zz:zz:zz:zz:zz' and body['key'] == 'top':
             log.info('unlock for %r', body['addr'])
             self.settings.mqtt.publish(
-                b"frontdoor/switch/strike/command", b'ON')
+                espName + b"/switch/strike/command", b'ON')
 
             
 if __name__ == '__main__':
@@ -169,7 +170,7 @@
         masterGraph.patchObject(ctx, ROOM['frontDoorLock'], ROOM['state'],
                                 stateFromMqtt(payload))
 
-    mqtt.subscribe(b"frontdoor/switch/strike/state").subscribe(on_next=toGraph)
+    mqtt.subscribe(espName + b"/switch/strike/state").subscribe(on_next=toGraph)
     port = 10011
     reactor.listenTCP(port, cyclone.web.Application(
         [