# HG changeset patch # User drewp@bigasterisk.com # Date 1557202062 25200 # Node ID 150aa09c9723be9aa0319757d5e5c9ee2b64e9fc # Parent 1209229cd56ed4c1872f366e29e08f28d70a3afb new simple mode that can set the door without rdf Ignore-this: ff9ab7c6507a7b3fb3252f91b078a318 diff -r 1209229cd56e -r 150aa09c9723 service/frontDoorLock/front_door_lock.py --- a/service/frontDoorLock/front_door_lock.py Mon May 06 21:06:08 2019 -0700 +++ b/service/frontDoorLock/front_door_lock.py Mon May 06 21:07:42 2019 -0700 @@ -76,6 +76,16 @@ return log.warn("ignoring %s", stmt) +class SimpleState(cyclone.web.RequestHandler): + def post(self): + state = self.request.body.strip().decode('ascii') + if state == 'unlock': + self.settings.autoLock.onUnlockedStmt() + self.settings.mqtt.publish(espName + b"/switch/strike/command", b'ON') + if state == 'lock': + self.settings.autoLock.onLockedStmt() + self.settings.mqtt.publish(espName + b"/switch/strike/command", b'OFF') + class AutoLock(object): def __init__(self, masterGraph, mqtt): @@ -97,7 +107,7 @@ if lockIn < 0: state = g._graph.value(self.subj, ROOM['state']) log.warn(f"timeUnlocked {self.timeUnlocked}, state {state}, " - "unlockedFor {unlockedFor}, lockIn {lockIn}") + f"unlockedFor {unlockedFor}, lockIn {lockIn}") lockIn = 0 g.patchObject(ctx, self.subj, ROOM['unlockedForSec'], Literal(int(unlockedFor))) @@ -184,11 +194,14 @@ [ (r"/()", cyclone.web.StaticFileHandler, {"path": ".", "default_filename": "index.html"}), + (r"/simple/()", cyclone.web.StaticFileHandler, + {"path": ".", "default_filename": "simple.html"}), (r"/graph", CycloneGraphHandler, {'masterGraph': masterGraph}), (r"/graph/events", CycloneGraphEventsHandler, {'masterGraph': masterGraph}), (r'/output', OutputPage), (r'/bluetoothButton', BluetoothButton), + (r'/simpleState', SimpleState), ], mqtt=mqtt, masterGraph=masterGraph, diff -r 1209229cd56e -r 150aa09c9723 service/frontDoorLock/index.html --- a/service/frontDoorLock/index.html Mon May 06 21:06:08 2019 -0700 +++ b/service/frontDoorLock/index.html Mon May 06 21:07:42 2019 -0700 @@ -176,6 +176,8 @@
+ root + /simple/ /stats/ /graph /graph/events diff -r 1209229cd56e -r 150aa09c9723 service/frontDoorLock/simple.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/service/frontDoorLock/simple.html Mon May 06 21:07:42 2019 -0700 @@ -0,0 +1,65 @@ + + + + front door lock simple + + + + + + + + +

Simple door control:

+ + + +
+ + + + + +
+ root + /simple/ + /stats/ + /graph + /graph/events + (post) output +
+ +