Maj après la démo

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/trunk@2245 b32b6428-25c9-4566-ad07-03861ab6144f

scripts/ensibs_alarm_SDB_haut.py

@@ -8,19 +8,22 @@ from enum import Enum
 
 DELAY = 30
 
-ADDR     = 'aa4d1cbc-92af-11e8-80cd-408d5c18c801'
+ADDR     = 'aa4d1cbc-92af-11e8-80cd-408d5c18c802'
 PKG_NAME = 'scenario_ensibs_alerte'
 
 DOOR     = 'ce91c3a6-20b1-11e9-a250-a4badbf92500'
 MVT      = '93e09033-708e-11e8-956e-00fec8f7138c'
-LIGHTS   = ['93e09007-708e-11e8-956e-00fec8f7138c','93e09008-708e-11e8-956e-00fec8f7138c']
+#LIGHTS   = ['93e09007-708e-11e8-956e-00fec8f7138c','93e09008-708e-11e8-956e-00fec8f7138c']
+LIGHT_PLAF  = '93e09007-708e-11e8-956e-00fec8f7138c'
+LIGHT_MIR   = '93e09008-708e-11e8-956e-00fec8f7138c'
 
 BULLET   = ['6eb64b73-6e51-11e9-8f96-00fec8f7138c']
 BLINKS   = ['aa8cd2e4-8c5d-11e9-b0ba-b827ebe99201','980a639c-20b1-11e9-8d70-a4badbf92500']
 SIREN    = ['980a639c-20b1-11e9-8d70-a4badbf92501',]
 
 
-MONITORING_DEVICES = [DOOR,LIGHTS,MVT]
+#MONITORING_DEVICES = [DOOR,LIGHTS,MVT]
+MONITORING_DEVICES = [DOOR,LIGHT_PLAF,LIGHT_MIR,MVT]
 
 class States(Enum):
     free       = 'free'
@@ -64,7 +67,7 @@ def send(targets,action,body=None):
 
 def alert():
     logger.warning('WARNING !!!!')
-    send(BULLET,'notify',{'title':'Alarme SDB haut !!','msg':"Personne inerte ou lumière oubliée"})
+    send(BULLET,'notify',{'title':'Alarme SDB haut !!','msg':"lumière oubliée"})
     send(BLINKS,'blink')
     send(SIREN,'play')
 
@@ -84,8 +87,10 @@ def on_event(event,dev):
     if event == Notification.new_device:
         if dev.address == DOOR  : devices.door   = dev
         if dev.address == MVT   : devices.motion = dev
-        if dev.address == LIGHTS[0] : devices.light0  = dev
-        if dev.address == LIGHTS[1] : devices.light1  = dev
+        #if dev.address == LIGHTS[0] : devices.light0  = dev
+        #if dev.address == LIGHTS[1] : devices.light1  = dev
+        if dev.address == LIGHT_PLAF : devices.light0  = dev
+        if dev.address == LIGHT_MIR  : devices.light1  = dev
 
         
     if event == Notification.attribute_change:

scripts/ensibs_alarm_WC_haut.py

@@ -63,7 +63,7 @@ def send(targets,action,body=None):
 
 def alert():
     logger.warning('WARNING !!!!')
-    send(BULLET,'notify',{'title':'Alarme WC haut !!','msg':"Personne inerte ou lumière oubliée"})
+    send(BULLET,'notify',{'title':'Alarme WC haut !!','msg':"Personne inerte"})
     send(BLINKS,'blink')
     send(SIREN,'play')