Index: HemodialysisDevice.py
===================================================================
diff -u -r7e8f523c6ecb0a8fe78714e66507af7bc1e286cb -r08bdd97f4bf72851052fd1e44178335bea9401e4
--- HemodialysisDevice.py	(.../HemodialysisDevice.py)	(revision 7e8f523c6ecb0a8fe78714e66507af7bc1e286cb)
+++ HemodialysisDevice.py	(.../HemodialysisDevice.py)	(revision 08bdd97f4bf72851052fd1e44178335bea9401e4)
@@ -351,6 +351,8 @@
 
         # Alarms message IDs
         MSG_ID_HD_ALARMS_PUBLISHED_STATUS = 0x0002
+        MSG_ID_HD_ALARM_ACTIVATE = 0x0003
+        MSG_ID_HD_ALARM_CLEAR = 0x0004
         MSG_ID_HD_ALARM_LAMP_OVERRIDE = 0x8004
         MSG_ID_HD_ALARM_STATE_OVERRIDE = 0x8006
         MSG_ID_HD_ALARM_TIME_OVERRIDE = 0x8007
@@ -374,9 +376,11 @@
         START_POS_ALARM_ESCALATES_IN = END_POS_ALARM_SILENCE_EXPIRES_IN
         END_POS_ALARM_ESCALATES_IN = START_POS_ALARM_ESCALATES_IN + 4
         START_POS_ALARMS_FLAGS = END_POS_ALARM_ESCALATES_IN
-
         END_POS_ALARMS_FLAGS = START_POS_ALARMS_FLAGS + 2
 
+        START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX
+        END_POS_ALARM_ID = START_POS_ALARM_ID + 2
+
         def __init__(self, outer_instance, can_interface=None):
             """
                 HD_Alarms constructor
@@ -393,12 +397,27 @@
                 can_interface.registerReceivingPublicationFunction(channel_id, msg_id,
                                                                    self.handlerAlarmsStatusSyncFunction)
 
+                channel_id = DenaliChannels.hd_alarm_broadcast_ch_id
+                msg_id = self.MSG_ID_HD_ALARM_ACTIVATE
+                can_interface.registerReceivingPublicationFunction(channel_id, msg_id,
+                                                                   self.handlerAlarmActivateFunction)
+                channel_id = DenaliChannels.hd_alarm_broadcast_ch_id
+                msg_id = self.MSG_ID_HD_ALARM_CLEAR
+                can_interface.registerReceivingPublicationFunction(channel_id, msg_id,
+                                                                   self.handlerAlarmClearFunction)
+
+            # composite alarm status based on latest HD alarm status broadcast message
             self.alarmsState = 0
             self.alarmTop = 0
             self.alarmsSilenceExpiresIn = 0
             self.alarmsEscalatesIn = 0
             self.alarmsFlags = 0
 
+            # alarm states based on received HD alarm activation and alarm clear messages
+            self.alarmStates = [False] * 50
+#            for x in range(0,511):
+#                self.alarmStates.append(False)
+
         def handlerAlarmsStatusSyncFunction(self, message):
             """
                 Handles published alarms status messages.  Alarms status data are captured
@@ -424,6 +443,28 @@
                 message['message'][self.START_POS_ALARMS_FLAGS:self.END_POS_ALARMS_FLAGS]),
                 byteorder=DenaliMessage.BYTE_ORDER)
 
+        def handlerAlarmActivateFunction(self, message):
+            """
+                Handles published HD alarm activation messages.
+
+                \param message:  published HD alarm activation message
+                \returns none
+            """
+
+            alarmID = struct.unpack('<H', message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID])
+            self.alarmStates[alarmID] = True
+
+        def handlerAlarmClearFunction(self, message):
+            """
+                Handles published HD alarm clear messages.
+
+                \param message:  published HD alarm clear message
+                \returns none
+            """
+
+            alarmID = struct.unpack('<H', message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID])
+            self.alarmStates[alarmID] = False
+
         def CmdAlarmStateOverride(self, reset, state, alarm):
             """
                 Constructs and sends the alarm state override command
@@ -731,7 +772,7 @@
                 Constructs and sends the blood flow set point override command
 
                 \param reset:  integer - 1 to reset a previous override, 0 to override
-                \param flow:  integer - flow set point (in mL/min) to override with
+                \param flow:  integer - flow set point (in mL/min) to override with (negative for reverse direction)
                 \returns 1 if successful, zero otherwise
             """
 
@@ -1880,6 +1921,7 @@
             self.dialysateInletPumpOcclusion = 0.0
             self.dialysateOutletPumpOcclusion = 0.0
 
+
         def handlerPresOcclSyncFunction(self, message):
             """
                 Handles published pressure & occlusion data messages.  Pressure data are captured
@@ -1942,6 +1984,25 @@
                 print("Timeout!!!!")
                 return False
 
+        # TEST CODE ***************************************
+        # def TestCANMessage(self, seq):
+        #     zero = self.outer_instance.integer2ByteArray(0)
+        #     seq1 = self.outer_instance.integer2ByteArray(seq)
+        #     seq2 = self.outer_instance.integer2ByteArray(seq+1)
+        #     seq3 = self.outer_instance.integer2ByteArray(seq+2)
+        #     seq4 = self.outer_instance.integer2ByteArray(seq+3)
+        #     seq5 = self.outer_instance.integer2ByteArray(seq+4)
+        #
+        #     payload = seq1 + zero + seq2 + zero + seq3 + zero + seq4 + zero + seq5
+        #
+        #     message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+        #                                          message_id=6,
+        #                                          payload=payload)
+        #
+        #     received_message = self.outer_instance.can_interface.send(message, 0)
+        #
+        #     return True
+
         def CmdVenousPressureMeasuredOverride(self, reset, pres):
             """
                 Constructs and sends the measured venous pressure \n
@@ -2151,6 +2212,7 @@
         b = struct.pack('<f', val)
         return b
 
+
 def test_HD_DialOutFlow():
     """
         test_HD_DialOutFlow is a pytest function to test the HD_DialOutFlow states
@@ -2196,6 +2258,10 @@
     # create an HD object called hd
     hd = HD()
 
+    while True:
+        sleep(1)
+        print(hd.Alarms.alarmStates)
+
     # wait 2 seconds and then login to HD as a tester
     sleep(2)
     hd._Basics.CmdLogInToHD()