Index: HD/Alarms.py
===================================================================
diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837
--- HD/Alarms.py	(.../Alarms.py)	(revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156)
+++ HD/Alarms.py	(.../Alarms.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -1,18 +1,17 @@
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
 import struct
-from .utils import integer2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, RESET
 
 
 class HDAlarms:
     """
-        \class HD_Alarms
+    \class HD_Alarms
 
-        \brief Hemodialysis Device (HD) Dialin API sub-class for alarm related commands.
+    \brief Hemodialysis Device (HD) Dialin API sub-class for alarm related commands.
     """
 
-    # Alarms message IDs
+    # alarms message IDs
     MSG_ID_HD_ALARMS_PUBLISHED_STATUS = 0x0002
     MSG_ID_HD_ALARM_ACTIVATE = 0x0003
     MSG_ID_HD_ALARM_CLEAR = 0x0004
@@ -46,11 +45,11 @@
 
     def __init__(self, can_interface):
         """
-            HD_Alarms constructor
+        HD_Alarms constructor
 
-            \param outer_instance: reference to the HD (outer) class.
+        \param outer_instance: reference to the HD (outer) class.
 
-            \returns HD_Alarms object.
+        \returns HD_Alarms object.
         """
         self.can_interface = can_interface
 
@@ -70,76 +69,75 @@
                                                                        self.handler_alarm_clear)
 
         # 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
+        self.alarms_state = 0
+        self.alarm_top = 0
+        self.alarms_silence_expires_in = 0
+        self.alarms_escalates_in = 0
+        self.alarms_flags = 0
 
         # alarm states based on received HD alarm activation and alarm clear messages
-        self.alarmStates = [False] * 50
+        self.alarm_states = [False] * 50
 
-
     def handler_alarms_status_sync(self, message):
         """
-            Handles published alarms status messages.  Alarms status data are captured
-            for reference.
+        Handles published alarms status messages.  alarms status data are captured
+        for reference.
 
-            \param message:  published blood flow data message
-            \returns none
+        \param message:  published blood flow data message
+        \returns none
         """
 
-        self.alarmsState = int.from_bytes(bytearray(
+        self.alarms_state = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_STATE:self.END_POS_ALARM_STATE]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarmTop = int.from_bytes(bytearray(
+        self.alarm_top = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_TOP:self.END_POS_ALARM_TOP]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarmsSilenceExpiresIn = int.from_bytes(bytearray(
+        self.alarms_silence_expires_in = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_SILENCE_EXPIRES_IN:self.END_POS_ALARM_SILENCE_EXPIRES_IN]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarmsEscalatesIn = int.from_bytes(bytearray(
+        self.alarms_escalates_in = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARM_ESCALATES_IN:self.END_POS_ALARM_ESCALATES_IN]),
             byteorder=DenaliMessage.BYTE_ORDER)
-        self.alarmsFlags = int.from_bytes(bytearray(
+        self.alarms_flags = int.from_bytes(bytearray(
             message['message'][self.START_POS_ALARMS_FLAGS:self.END_POS_ALARMS_FLAGS]),
             byteorder=DenaliMessage.BYTE_ORDER)
 
     def handler_alarm_activate(self, message):
         """
-            Handles published HD alarm activation messages.
+        Handles published HD alarm activation messages.
 
-            \param message:  published HD alarm activation message
-            \returns none
+        \param message:  published HD alarm activation message
+        \returns none
         """
 
-        alarmID = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
-        self.alarmStates[alarmID[0]] = True
+        alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
+        self.alarm_states[alarm_id[0]] = True
 
     def handler_alarm_clear(self, message):
         """
-            Handles published HD alarm clear messages.
+        Handles published HD alarm clear messages.
 
-            \param message:  published HD alarm clear message
-            \returns none
+        \param message:  published HD alarm clear message
+        \returns none
         """
 
-        alarmID = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
-        self.alarmStates[alarmID[0]] = False
+        alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
+        self.alarm_states[alarm_id[0]] = False
 
     def cmd_alarm_state_override(self, reset, state, alarm):
         """
-            Constructs and sends the alarm state override command
+        Constructs and sends the alarm state override command
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param state:  integer - 1 for alarm active, 0 for alarm inactive
-            \param alarm:  integer - ID of alarm to override
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param state:  integer - 1 for alarm active, 0 for alarm inactive
+        \param alarm:  integer - ID of alarm to override
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        sta = integer2ByteArray(state)
-        alm = integer2ByteArray(alarm)
+        rst = integer_to_byte_array(reset)
+        sta = integer_to_byte_array(state)
+        alm = integer_to_byte_array(alarm)
         payload = rst + sta + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -154,7 +152,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = ("active" if state != 0 else "inactive")
@@ -168,17 +166,17 @@
 
     def cmd_alarm_time_override(self, reset, time_ms, alarm):
         """
-            Constructs and sends the alarm time override command
+        Constructs and sends the alarm time override command
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param time_ms:  integer - time (in ms) since alarm was activated
-            \param alarm:  integer - ID of alarm to override
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param time_ms:  integer - time (in ms) since alarm was activated
+        \param alarm:  integer - ID of alarm to override
+        \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        ms = integer2ByteArray(time_ms)
-        alm = integer2ByteArray(alarm)
+        rst = integer_to_byte_array(reset)
+        ms = integer_to_byte_array(time_ms)
+        alm = integer_to_byte_array(alarm)
         payload = rst + ms + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -193,7 +191,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(time_ms)
@@ -207,23 +205,23 @@
 
     def cmd_alarm_lamp_pattern_override(self, reset, pattern):
         """
-            Constructs and sends the alarm lamp pattern override command.
+        Constructs and sends the alarm lamp pattern override command.
 
-            \param reset:  integer - 1 to reset a previous override, 0 to override
-            \param pattern:  integer - ID of alarm lamp pattern to override with
-            \returns 1 if successful, zero otherwise
+        \param reset:  integer - 1 to reset a previous override, 0 to override
+        \param pattern:  integer - ID of alarm lamp pattern to override with
+        \returns 1 if successful, zero otherwise
 
-            \details Patterns: \n
-                0 = off \n
-                1 = ok \n
-                2 = fault \n
-                3 = high \n
-                4 = medium \n
-                5 = low \n
-                6 = manual
+        \details Patterns: \n
+            0 = off \n
+            1 = ok \n
+            2 = fault \n
+            3 = high \n
+            4 = medium \n
+            5 = low \n
+            6 = manual
         """
-        rst = integer2ByteArray(reset)
-        pat = integer2ByteArray(pattern)
+        rst = integer_to_byte_array(reset)
+        pat = integer_to_byte_array(pattern)
         payload = rst + pat
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -238,7 +236,7 @@
         # If there is content...
         if received_message is not None:
             print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_pat = "reset back to normal"
             elif pattern == self.HD_ALARM_LAMP_PATTERN_OFF:
                 str_pat = "off"