Ticket8780 alarms config

src/server_common/schema/blocks.xsd

@@ -26,6 +26,11 @@
         <xs:element ref="blk:log_deadband" minOccurs="0"/>
         <xs:element ref="blk:set_block" minOccurs="0"/>
         <xs:element ref="blk:set_block_val" minOccurs="0"/>
+        <xs:element ref="blk:alarm_enabled" minOccurs="0"/>
+		<xs:element ref="blk:alarm_latched" minOccurs="0"/>
+        <xs:element ref="blk:alarm_delay" minOccurs="0"/>
+        <xs:element ref="blk:alarm_guidance" minOccurs="0"/>
+
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -42,4 +47,8 @@
   <xs:element name="log_deadband" type="xs:double"/>
   <xs:element name="set_block" type="xs:string"/>
   <xs:element name="set_block_val" type="xs:string"/>
+  <xs:element name="alarm_enabled" type="xs:string"/>
+  <xs:element name="alarm_latched" type="xs:string"/>
+  <xs:element name="alarm_delay" type="xs:double"/>
+  <xs:element name="alarm_guidance" type="xs:string"/>
 </xs:schema>

src/server_common/utilities.py

@@ -44,7 +44,7 @@
     MAJOR = "MAJOR"
 
 
 def char_waveform(length):
     """
     Helper function for creating a char waveform PV.
 
@@ -57,7 +57,7 @@
     return {"type": "char", "count": length, "value": [0]}
 
 
 def set_logger(logger):
     """Sets the logger used by the print_and_log function.
 
     Args:
@@ -67,12 +67,12 @@
     LOGGER = logger
 
 
 def print_and_log(message, severity=SEVERITY.INFO, src="BLOCKSVR"):
     """Prints the specified message to the console and writes it to the log.
 
     Args:
         message (string|exception): The message to log
         severity (string, optional): Gives the severity of the message. Expected serverities are MAJOR, MINOR and INFO.
                                     Default severity is INFO.
         src (string, optional): Gives the source of the message. Default source is BLOCKSVR.
     """
@@ -82,7 +82,7 @@
         LOGGER.write_to_log(message, severity, src)
 
 
 def compress_and_hex(value):
     """Compresses the inputted string and encodes it as hex.
 
     Args:
@@ -371,3 +371,14 @@
     except (ValueError, TypeError) as ex:
         print(f"Can not interpret date '{date_arg}' error: {ex}")
         exit(error_code)
+
+def dehex_and_decompress_waveform_value(value):
+    """Decompresses the inputted waveform, assuming it is available as string.
+
+    Args:
+        value (str): The string to be decompressed
+
+    Returns:
+        str : A decompressed and unhexed version of the input string
+    """
+    return zlib.decompress(binascii.unhexlify(value))