X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=switch-power.py;h=6b8b9f51fbb16b86eb2cdf0503022921a450d1eb;hb=3603aadaf3ed9269188d9f19383a48af82f27d9f;hp=8d7bf36bfdd3452299b61d029d3f36798d492bc6;hpb=a0596eb57bc6d4fe2587b5bace320f24c689209f;p=svn42.git

diff --git a/switch-power.py b/switch-power.py
index 8d7bf36..6b8b9f5 100755
--- a/switch-power.py
+++ b/switch-power.py
@@ -38,7 +38,7 @@ class UWSConfig:
     self.config_parser.set('slug','ids_present_day','werkzeug')
     self.config_parser.set('slug','ids_present_night','werkzeug schreibtisch idee labor')
     self.config_parser.set('slug','ids_panic','idee schreibtisch labor werkzeug')
-    self.config_parser.set('slug','ids_nonpresent_off','idee schreibtisch labor werkzeug stereo decke1 decke2')
+    self.config_parser.set('slug','ids_nonpresent_off','lichter stereo deckehinten')
     #self.config_parser.set('slug','time_day','6:00-17:00')
     self.config_parser.add_section('debug')
     self.config_parser.set('debug','enabled',"False")
@@ -182,25 +182,25 @@ def eventNobodyHere():
   logging.info("event: noone here, switching off: "+present_ids)
   for id in present_ids.split(" "):
     switchPower(id,False)
+  for id in present_ids.split(" "):
+    time.sleep(0.3)
     switchPower(id,False)
 
 def eventPanic():
   logging.info("event: Panic:, switching around: "+uwscfg.slug_ids_panic)
   lst1 = uwscfg.slug_ids_panic.split(" ")
-  lst2 = lst1
-  lst2.append(lst2.pop(0))
-  #guarantee list has even number of elements by multiplying it with a factor of 2
-  lst=zip(lst1,lst2) * 8
-  lst2=None
-  switchPower(lst[0][0],True)
-  for (id1,id2) in lst: 
-    switchPower(id2,True)
-    time.sleep(0.3)
-    switchPower(id1,False)
-  time.sleep(0.6)
-  for id in lst1:
+  lst2 = map(lambda e:[e,True], lst1)
+  for delay in map(lambda e: (40-e)/133.0,range(0,20)):
+    e = random.choice(lst2)
+    e[1]=not e[1]
+    switchPower(e[0],e[1]) 
+    time.sleep(delay)
+  random.shuffle(lst1)
+  for rep in lst1:
     switchPower(id,False)
+  time.sleep(1.2)
   eventPresent()
+    
 
 ########################