Index: leahi_dialin/dd/modules/gen_dialysate.py
===================================================================
diff -u -r351b713da824c7d6d7f73d0b33ddf1fd53621f1a -r5998c4c4db7fa962b808b88af410be5d82d442be
--- leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision 351b713da824c7d6d7f73d0b33ddf1fd53621f1a)
+++ leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision 5998c4c4db7fa962b808b88af410be5d82d442be)
@@ -43,51 +43,51 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value
+            msg_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self._handler_balancing_chamber_sync)
+                                                                       self._handler_gen_dialysate_sync)
 
         self.execution_state = 0
         self.dialysate_delivery_in_progress = 0
-        self.floater_level = 0
-        self.bicarb_level = 0
-        self.spent_chamber_level = 0
-        self.hydraulics_negative_pressure = 0.0
-        self.hydraulics_positive_pressure = 0.0
-        self.spent_dialysate_pressure = 0.0
+        self.d6_level = 0
+        self.d63_level = 0
+        self.d46_level = 0
+        self.d9_pressure = 0.0
+        self.d18_pressure = 0.0
+        self.d51_pressure = 0.0
         self.dialysate_good_to_deliver = 0
         self.dd_gen_dialysate_timestamp = 0
 
     @publish(["dd_gen_dialysate_timestamp",
               "execution_state", "dialysate_delivery_in_progress",
-              "floater_level",
-              "bicarb_level", "spent_chamber_level",
-              "hydraulics_negative_pressure",
-              "hydraulics_positive_pressure", "spent_dialysate_pressure",
+              "d6_level",
+              "d63_level", "d46_level",
+              "d9_pressure",
+              "d18_pressure", "d51_pressure",
               "dialysate_good_to_deliver"])
-    def _handler_balancing_chamber_sync(self, message, timestamp=0.0):
+    def _handler_gen_dialysate_sync(self, message, timestamp=0.0):
         """
-        Handles published balancing chamber data messages.
+        Handles published gen dialysate data messages.
 
-        @param message:  published balancing chamber data message
+        @param message:  published gen dialysate data message
         @return: None
         """
 
         self.execution_state = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
         self.dialysate_delivery_in_progress = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.floater_level = struct.unpack('I', bytearray(
+        self.d6_level = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.bicarb_level = struct.unpack('I', bytearray(
+        self.d63_level = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.spent_chamber_level = struct.unpack('I', bytearray(
+        self.d46_level = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.hydraulics_negative_pressure = struct.unpack('f', bytearray(
+        self.d9_pressure = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.hydraulics_positive_pressure = struct.unpack('f', bytearray(
+        self.d18_pressure = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.spent_dialysate_pressure = struct.unpack('f', bytearray(
+        self.d51_pressure = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
         self.dialysate_good_to_deliver = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
@@ -197,4 +197,39 @@
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.error("Timeout!!!!")
+            return False
+
+    def cmd_hydraulics_chamber_target_temperature_override(self, temperature: float, reset: int = NO_RESET) -> int:
+        """
+        Constructs and sends the hydraulic fluid temperature override command
+
+        @param temperature:  float - value to override in fluid temperature.
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
+
+        """
+
+        reset_byte_array = integer_to_bytearray(reset)
+        tmp = float_to_bytearray(temperature)
+        payload = reset_byte_array + tmp
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
+                                              message_id=MsgIds.MSG_ID_DD_HYD_CHAMBER_TARGET_TEMP_OVERRIDE_REQUEST.value,
+                                              payload=payload)
+
+        if reset == RESET:
+            str_res = "reset back to normal"
+        else:
+            str_res = str(temperature)
+        self.logger.debug("override hydraulic fluid temperature to " + ": " + str_res)
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            # response payload is OK or not OK
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.error("Timeout!!!!")
             return False
\ No newline at end of file