# HG changeset patch # User drewp@bigasterisk.com # Date 1557121475 25200 # Node ID 2d8a5532f1b5f1d62cbba91be00ca3169c1476b4 # Parent 2a24a6c7a843f5f5d0a4c0d46dc6c65f051045cd match esp hostname in py code Ignore-this: 57f2db842b5935faad0214bac52f5adc diff -r 2a24a6c7a843 -r 2d8a5532f1b5 service/frontDoorLock/front_door_lock.py --- 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( [