Index: dialin/dg/heaters.py
===================================================================
diff -u -rceb2d67297d31ac7c816f01cd4f836f071c1d39a -r5a8384b853ce2b14970f075fc6b4ac2f3b824d21
--- dialin/dg/heaters.py	(.../heaters.py)	(revision ceb2d67297d31ac7c816f01cd4f836f071c1d39a)
+++ dialin/dg/heaters.py	(.../heaters.py)	(revision 5a8384b853ce2b14970f075fc6b4ac2f3b824d21)
@@ -7,8 +7,8 @@
 #
 # @file    heaters.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      30-Jan-2023
+# @author  (last)      Micahel Garthwaite
+# @date    (last)      09-Mar-2023
 # @author  (original)  Dara Navaei
 # @date    (original)  29-May-2020
 #
@@ -263,7 +263,7 @@
         reset_value = integer_to_bytearray(reset)
         heater_name = integer_to_bytearray(heater)
         duty = float_to_bytearray(duty_cycle/100)
-        payload = reset_value + heater_name + duty
+        payload = reset_value + duty + heater_name
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
                                               message_id=MsgIds.MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE.value,
                                               payload=payload)
Index: dialin/hd/air_pump.py
===================================================================
diff -u -reed13ddfba5bd65563145b6e5b9a882da851878e -r5a8384b853ce2b14970f075fc6b4ac2f3b824d21
--- dialin/hd/air_pump.py	(.../air_pump.py)	(revision eed13ddfba5bd65563145b6e5b9a882da851878e)
+++ dialin/hd/air_pump.py	(.../air_pump.py)	(revision 5a8384b853ce2b14970f075fc6b4ac2f3b824d21)
@@ -8,7 +8,7 @@
 # @file    air_pump.py
 #
 # @author  (last)      Micahel Garthwaite
-# @date    (last)      22-Dec-2022
+# @date    (last)      07-Mar-2023
 # @author  (original)  Micahel Garthwaite
 # @date    (original)  21-Nov-2022
 #
@@ -52,6 +52,10 @@
     def get_air_pump_state(self):
         """
         Gets the air pump state
+            AIR_PUMP_STATE_INIT = 0,        ///< Air Pump Initialize state
+            AIR_PUMP_STATE_OFF,             ///< Air Pump Off state
+            AIR_PUMP_STATE_ON,              ///< Air Pump On state
+            NUM_OF_AIR_PUMP_STATES,         ///< Number of air pump states
 
         @return: the current air pump state.
         """
@@ -74,6 +78,11 @@
     def cmd_air_pump_set_state(self, state: int) -> int:
         """
         Constructs and sends the air pump set state command.
+            AIR_PUMP_STATE_INIT = 0,        ///< Air Pump Initialize state
+            AIR_PUMP_STATE_OFF,             ///< Air Pump Off state
+            AIR_PUMP_STATE_ON,              ///< Air Pump On state
+            NUM_OF_AIR_PUMP_STATES,         ///< Number of air pump states
+            
         Constraints:
             Must be logged into HD.
 
Index: dialin/hd/battery.py
===================================================================
diff -u -r1a02639c3941c0afc248ef93d7e1c521317e8d00 -r5a8384b853ce2b14970f075fc6b4ac2f3b824d21
--- dialin/hd/battery.py	(.../battery.py)	(revision 1a02639c3941c0afc248ef93d7e1c521317e8d00)
+++ dialin/hd/battery.py	(.../battery.py)	(revision 5a8384b853ce2b14970f075fc6b4ac2f3b824d21)
@@ -8,7 +8,7 @@
 # @file    battery.py
 #
 # @author  (last)      Micahel Garthwaite
-# @date    (last)      09-Feb-2023
+# @date    (last)      01-Mar-2023
 # @author  (original)  Steve Jarpe
 # @date    (original)  27-Sep-2022
 #
@@ -100,7 +100,7 @@
             [self.AtRateTimeToFull, "AtRateTimeToFull", "int", "minutes"],
             [self.AtRateTimeToEmpty, "AtRateTimeToEmpty", "int", "minutes"],
             [self.AtRateOK, "AtRateOK", "bool", None],
-            [self.Temperature, "Temperature", "temperature", "degC"],
+            [self.Temperature, "Temperature", "temperature", "degK"],
             [self.Voltage, "Voltage", "int", "mV"],
             [self.Current, "Current", "int", "mA"],
             [self.AverageCurrent, "AverageCurrent", "int", "mA"],
@@ -117,7 +117,7 @@
             [self.DesignCapacity, "DesignCapacity", "int", "mAh"],
             [self.DesignVoltage, "DesignVoltage", "int", "mV"],
             [self.SpecificationInfo, "SpecificationInfo", "int", None],
-            [self.ManufactureDate, "ManufactureDate", "int", "percent"],
+            [self.ManufactureDate, "ManufactureDate", "int", "encodedBitMap"],
             [self.SerialNumber, "SerialNumber", "int", None],
             [self.ManufacturerName, "ManufacturerName", "string", None],
             [self.DeviceName, "DeviceName", "string", None],
Index: dialin/hd/pressure_occlusion.py
===================================================================
diff -u -r36a7662dc9d72a7aa3eba334b5194cb1415fcd81 -r5a8384b853ce2b14970f075fc6b4ac2f3b824d21
--- dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision 36a7662dc9d72a7aa3eba334b5194cb1415fcd81)
+++ dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision 5a8384b853ce2b14970f075fc6b4ac2f3b824d21)
@@ -7,8 +7,8 @@
 #
 # @file    pressure_occlusion.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      19-Oct-2022
+# @author  (last)      Micahel Garthwaite
+# @date    (last)      08-Mar-2023
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
@@ -93,10 +93,6 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
         bp = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
-        dpi = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
-        dpo = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
 
         self.arterial_pressure = art[0]
         self.venous_pressure = ven[0]