From: realraum <realraum@realraum.at>
Date: Thu, 30 Apr 2009 03:22:12 +0000 (+0000)
Subject: nice mit sleep
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=0a7317d6437ef9aeb9266926e60017150dc181aa;p=svn42.git

nice mit sleep
---

diff --git a/door_daemon.py b/door_daemon.py
index 8ff8435..76e3951 100755
--- a/door_daemon.py
+++ b/door_daemon.py
@@ -22,7 +22,7 @@ class StatusDisplay():
   def display_open(self):
     if self.last_status_set != self.url_open:
       self.last_status_set=self.url_open
-      print "accessing %s\n" % self.last_status_set
+      #print "accessing %s\n" % self.last_status_set
       f = urllib.urlopen(self.last_status_set)
       f.read()
       f.close()
@@ -30,7 +30,7 @@ class StatusDisplay():
   def display_closed(self):
     if self.last_status_set != self.url_closed:
       self.last_status_set=self.url_closed
-      print "accessing %s\n" % self.last_status_set
+      #print "accessing %s\n" % self.last_status_set
       f = urllib.urlopen(self.last_status_set)
       f.read()
       f.close()
@@ -62,26 +62,35 @@ class ArduinoUSBThread ( threading.Thread ):
 
   def send_open(self):
     self.send_statusrequest()
+    self.cv_updatestatus.acquire()
     if self.re_isidle.search(self.lastline):
       logging.info("Opening Door")
       print("\nSending o..")
       self.fh.write("o");
       print("done\n")
+    self.cv_updatestatus.release()
     
   def send_close(self):
     self.send_statusrequest()
+    self.cv_updatestatus.acquire()
     if self.re_isidle.search(self.lastline):
       logging.info("Closing Door")
       print("\nSending c..")
       self.fh.write("c");
       print("done\n")
+    self.cv_updatestatus.release()
       
   def send_toggle(self):
     self.send_statusrequest()
+    self.cv_updatestatus.acquire()
     if self.last_status == "open":
+      self.cv_updatestatus.release()
       self.send_close()
     elif self.last_status == "closed":
+      self.cv_updatestatus.release()
       self.send_open()
+    else:
+      self.cv_updatestatus.release()
       
   def send_reset(self):
     logging.info("Resetting Door")
@@ -102,9 +111,8 @@ class ArduinoUSBThread ( threading.Thread ):
       try:
         line = self.fh.readline();
       except IOError, e:
-        time.sleep(1.0)
+        time.sleep(0.5)
         continue
-      print "l"
       self.cv_updatestatus.acquire()
       self.lastline=line
       logging.info(self.file_dev_ttyusb+": "+self.lastline)