From: Vincent Date: Tue, 3 Sep 2019 08:31:52 +0000 (+0200) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=48dabe6525717aa99b3d1934ad89f3a39eb2177f;p=tortuga-home.git . --- diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3fff1a2..ce88a21 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,8 @@ + + @@ -717,14 +719,7 @@ - - - - 1551172860066 - 1551173524013 @@ -1062,7 +1057,14 @@ - diff --git a/tools/pop/pop.py b/tools/pop/pop.py index 0b26b6f..223686a 100644 --- a/tools/pop/pop.py +++ b/tools/pop/pop.py @@ -5,11 +5,13 @@ from urllib2 import urlopen import sys device = sys.argv[1] -room = sys.argv[2] -mac = sys.argv[3] map = ['', '', 'tap', 'long', 'double'] +rooms = {'wc': 'wc'} +macs = {'wc': 'a0:e6:f8:db:ff:2f'} +mac = macs[device] +room = rooms[device] class MyDelegate(btle.DefaultDelegate): def __init__(self): diff --git a/tools/pop/startpopdaemon b/tools/pop/startpopdaemon new file mode 100644 index 0000000..88d43a3 --- /dev/null +++ b/tools/pop/startpopdaemon @@ -0,0 +1,2 @@ +#!/bin/sh +/sbin/start-stop-daemon --start --quiet --user root --chuid root --name pop-$1 --make-pidfile --pidfile /run/pop-$1.pid --background --startas /bin/bash -- -c "exec /var/www/home/tools/pop/pop.py $1 >> /var/log/pop/$1.log" \ No newline at end of file diff --git a/tools/pop/stoppopdaemon b/tools/pop/stoppopdaemon new file mode 100644 index 0000000..7354667 --- /dev/null +++ b/tools/pop/stoppopdaemon @@ -0,0 +1,2 @@ +#!/bin/sh +/sbin/start-stop-daemon --stop --pidfile /run/pop-$1.pid --retry 10 \ No newline at end of file