Mercurial > code > home > repos > homeauto

changeset 460:7051b8b4766a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build updates. hack in r/g/b and some fixed multipliers Ignore-this: 155d402cd863cf9be2b59f5595131c0d
author drewp@bigasterisk.com
date Sat, 20 Apr 2019 23:32:36 -0700
parents a471688fb7b7
children cebc0134254a
files service/mqtt_graph_bridge/makefile service/mqtt_graph_bridge/mqtt_graph_bridge.py service/mqtt_graph_bridge/requirements.txt
diffstat 3 files changed, 28 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/service/mqtt_graph_bridge/makefile	Sat Apr 20 23:31:16 2019 -0700
+++ b/service/mqtt_graph_bridge/makefile	Sat Apr 20 23:32:36 2019 -0700
@@ -6,7 +6,7 @@
 build_image:
 	rm -rf tmp_ctx
 	mkdir -p tmp_ctx
-	cp -a Dockerfile ../../lib/*.py *.py *.txt tmp_ctx
+	cp -a Dockerfile ../../lib/*.py *.py *.txt *.html tmp_ctx
 	docker build --network=host -t ${TAG} tmp_ctx
 	docker push ${TAG}
 	rm -rf tmp_ctx
@@ -17,3 +17,6 @@
 
 local_run: build_image
 	docker run --rm -it --net=host bang6:5000/mqtt_graph_bridge_x86:latest
+
+redeploy: build_image
+	supervisorctl restart $(JOB)_$(PORT)
--- a/service/mqtt_graph_bridge/mqtt_graph_bridge.py	Sat Apr 20 23:31:16 2019 -0700
+++ b/service/mqtt_graph_bridge/mqtt_graph_bridge.py	Sat Apr 20 23:32:36 2019 -0700
@@ -10,8 +10,14 @@
 ROOM = Namespace('http://projects.bigasterisk.com/room/')
 
 devs = {
-    ROOM['kitchenLight']: {'root': 'h801_skylight', 'ctx': ROOM['kitchenH801']},
-    ROOM['kitchenCounterLight']: {'root': 'h801_counter', 'ctx': ROOM['kitchenH801']},
+    ROOM['kitchenLight']: {
+        'root': 'h801_skylight',
+        'ctx': ROOM['kitchenH801']
+    },
+    ROOM['kitchenCounterLight']: {
+        'root': 'h801_counter',
+        'ctx': ROOM['kitchenH801']
+    },
 }
 
 logging.basicConfig()
@@ -44,10 +50,19 @@
         ignored = True
         for dev, attrs in devs.items():
             if stmt[0:2] == (dev, ROOM['brightness']):
-                self.settings.mqtt.publish("%s/light/kit_w1/command" % attrs['root'],
-                                           json.dumps({'state': 'ON', 'brightness': int(stmt[2].toPython() * 255)}))                
-                self.settings.masterGraph.patchObject(attrs['ctx'],
-                                                      stmt[0], stmt[1], stmt[2])
+                for chan, scale in [('w1', 1),
+                                    ('r', 1),
+                                    ('g', .8),
+                                    ('b', .8)]:
+                    out = stmt[2].toPython() * scale 
+                    self.settings.mqtt.publish(
+                        "%s/light/kit_%s/command" % (attrs['root'], chan),
+                        json.dumps({
+                            'state': 'ON',
+                            'brightness': int(out * 255)}))
+                self.settings.masterGraph.patchObject(
+                    attrs['ctx'],
+                    stmt[0], stmt[1], stmt[2])
                 ignored = False
         if ignored:
             log.warn("ignoring %s", stmt)
@@ -70,6 +85,8 @@
 
     port = 10008
     reactor.listenTCP(port, cyclone.web.Application([
+        (r"/()", cyclone.web.StaticFileHandler,
+         {"path": ".", "default_filename": "index.html"}),
         (r"/graph", CycloneGraphHandler, {'masterGraph': masterGraph}),
         (r"/graph/events", CycloneGraphEventsHandler,
          {'masterGraph': masterGraph}),
--- a/service/mqtt_graph_bridge/requirements.txt	Sat Apr 20 23:31:16 2019 -0700
+++ b/service/mqtt_graph_bridge/requirements.txt	Sat Apr 20 23:32:36 2019 -0700
@@ -2,5 +2,5 @@
 rdflib-jsonld==0.4.0
 rdflib==4.2.2
 twisted-mqtt==0.3.6
-https://projects.bigasterisk.com/rdfdb/rdfdb-0.3.0.tar.gz
+https://projects.bigasterisk.com/rdfdb/rdfdb-0.8.0.tar.gz
 rx==1.6.1