initial import

server/EbsFlags.py

@@ -16,7 +16,7 @@ from tango.server import Device, device_property, command, attribute, run
 ###################################################################################################
 class EbsFlags(Device): 
 
-    InjectionInProgressTmoInSeconds = device_property(dtype=tango.DevUShort, default_value=120)
+    TopUpInjectionInProgressTmoInSeconds = device_property(dtype=tango.DevUShort, default_value=120)
 
     class TangoHandler(logging.Handler):
 
@@ -67,9 +67,9 @@ class EbsFlags(Device):
             t.name = "MAIN"
             # EBS flags
             self.__flags = {
-                'InjectionInProgress': {'value':False, 
-                                        'timeout':self.InjectionInProgressTmoInSeconds, 
-                                        'timestamp':datetime.datetime.now()}
+                'TopUpInjectionInProgress': {'value':False, 
+                                             'timeout':self.TopUpInjectionInProgressTmoInSeconds, 
+                                             'timestamp':datetime.datetime.now()}
             }
             self.__injection_in_progress = False
             # setup the device logger
@@ -105,22 +105,22 @@ class EbsFlags(Device):
             elapsed_seconds = (datetime.datetime.now() - flag_info['timestamp']).total_seconds() 
             if flag_info['value'] and elapsed_seconds >= flag_info['timeout']:
                 self.__logger.info("timeout expires for flag '{}' - resetting it's value to False".format(flag))
-                self.__flags['InjectionInProgress']['timestamp'] = datetime.datetime.now()
-                self.__flags['InjectionInProgress']['value'] = False
+                self.__flags[flag]['timestamp'] = datetime.datetime.now()
+                self.__flags[flag]['value'] = False
 
     @attribute(dtype=[str], max_dim_x=4096)
     def Traces(self):
         return list(self.__traces)
 
     @attribute(dtype=tango.DevBoolean)
-    def InjectionInProgress(self):
-        return self.__flags['InjectionInProgress']['value']
-
-    @InjectionInProgress.write
-    def InjectionInProgress(self, iip:bool):
-        self.__logger.info("flag InjectionInProgress set to {}".format(iip))
-        self.__flags['InjectionInProgress']['timestamp'] = datetime.datetime.now()
-        self.__flags['InjectionInProgress']['value'] = iip
+    def TopUpInjectionInProgress(self):
+        return self.__flags['TopUpInjectionInProgress']['value']
+
+    @TopUpInjectionInProgress.write
+    def TopUpInjectionInProgress(self, iip:bool):
+        self.__logger.info("flag TopUpInjectionInProgress set to {}".format(iip))
+        self.__flags['TopUpInjectionInProgress']['timestamp'] = datetime.datetime.now()
+        self.__flags['TopUpInjectionInProgress']['value'] = iip
     
 if __name__ == '__main__':
     try: