.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3fff1a2847d4e908d75a7fee2ddc62d4b9ac0599..ce88a21737d3af4481859aba63dcd77be245b0c2 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change afterPath="$PROJECT_DIR$/tools/pop/startpopdaemon" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/pop/stoppopdaemon" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/tools/pop/pop.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/pop.py" afterDir="false" />
     </list>
@@ -717,14 +719,7 @@
       <workItem from="1567019296675" duration="5845000" />
       <workItem from="1567261528772" duration="609000" />
       <workItem from="1567408023339" duration="2511000" />
-      <workItem from="1567413752073" duration="7508000" />
-    </task>
-    <task id="LOCAL-00171" summary=".">
-      <created>1551172860066</created>
-      <option name="number" value="00171" />
-      <option name="presentableId" value="LOCAL-00171" />
-      <option name="project" value="LOCAL" />
-      <updated>1551172860067</updated>
+      <workItem from="1567413752073" duration="9000000" />
     </task>
     <task id="LOCAL-00172" summary=".">
       <created>1551173524013</created>
@@ -1062,7 +1057,14 @@
       <option name="project" value="LOCAL" />
       <updated>1567453650665</updated>
     </task>
-    <option name="localTasksCounter" value="220" />
+    <task id="LOCAL-00220" summary=".">
+      <created>1567497032711</created>
+      <option name="number" value="00220" />
+      <option name="presentableId" value="LOCAL-00220" />
+      <option name="project" value="LOCAL" />
+      <updated>1567497032711</updated>
+    </task>
+    <option name="localTasksCounter" value="221" />
     <servers />
   </component>
   <component name="TodoView">

diff --git a/tools/pop/pop.py b/tools/pop/pop.py
index 0b26b6f5473921d42be0114b6cec6fbf9da7c138..223686acf2632b2f865e75603f0a825720f15f82 100644 (file)
--- 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 (file)
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 (file)
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