Index: leahi_dialin/dd/modules/drybicart.py
===================================================================
diff -u -r0e852e50782a638367a1139f8c56cd8d722ba648 -r4b25823d00adbe6ef7cab733184f78dc3fc7f515
--- leahi_dialin/dd/modules/drybicart.py	(.../drybicart.py)	(revision 0e852e50782a638367a1139f8c56cd8d722ba648)
+++ leahi_dialin/dd/modules/drybicart.py	(.../drybicart.py)	(revision 4b25823d00adbe6ef7cab733184f78dc3fc7f515)
@@ -24,7 +24,7 @@
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
-class DDBDryBicart(AbstractSubSystem):
+class DDDryBicart(AbstractSubSystem):
     """
     DryBicart
 
@@ -43,19 +43,23 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_dry_bicart_data = MsgIds.MSG_ID_DD_DRY_BICART_FILL_DATA.value
+            self.msg_id_dd_dry_bicart_data = MsgIds.MSG_ID_DD_DRY_BICART_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_dry_bicart_data,
                                                                        self._handler_dry_bicart_sync)
 
         self.execution_state = 0
+        self.dry_bicart_fill_cycle_counter = 0
         self.dry_bicart_max_fill_cycle_count = 0
         self.dry_bicart_fill_request = 0
+        self.dry_bicart_last_fill_time = 0
+        self.dry_bicart_current_fill_time = 0
         self.dd_dry_bicart_timestamp = 0
 
 
     @publish(["msg_id_dd_dry_bicart_data",
-              "execution_state", "dry_bicart_max_fill_cycle_count",
-              "dry_bicart_fill_request"])
+              "execution_state", "dry_bicart_fill_cycle_counter", "dry_bicart_max_fill_cycle_count",
+              "dry_bicart_fill_request", "dry_bicart_last_fill_time", "dry_bicart_current_fill_time",
+              "dd_dry_bicart_timestamp"])
     def _handler_dry_bicart_sync(self, message, timestamp=0.0):
         """
         Handles published dry bicart data messages.
@@ -66,12 +70,19 @@
 
         self.execution_state = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.dry_bicart_max_fill_cycle_count = struct.unpack('I', bytearray(
+        self.dry_bicart_fill_cycle_counter = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.dry_bicart_fill_request = struct.unpack('f', bytearray(
+        self.dry_bicart_max_fill_cycle_count = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
+         self.dry_bicart_fill_request = struct.unpack('I', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
+        self.dry_bicart_last_fill_time = struct.unpack('I', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
+        self.dry_bicart_current_fill_time = struct.unpack('I', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
 
 
+
         self.dd_dry_bicart_timestamp = timestamp
 
     def cmd_dry_bicart_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
@@ -94,7 +105,7 @@
         payload = reset_byte_array + ms_byte_array
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_DRY_BICART_DATA_PUBLISH_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("override DD Dry Bicart data broadcast interval")
@@ -126,7 +137,7 @@
         payload = reset_byte_array + cycle_count
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_DRY_BICART_MAX_FILL_CYCLE_COUNT_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         if reset == RESET:
@@ -146,22 +157,23 @@
             self.logger.error("Timeout!!!!")
             return False
 
-    def cmd_dry_bicart_fill_request_override(self, start_stop: bool) -> int:
+    def cmd_dry_bicart_fill_request_override(self, start_stop: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the dry bicart fill request override command
         Constraints:
             Must be logged into DD.
 
-        @param start_stop:  bool - value to start or stop switch ( start = 1, stop = 0
+        @param start_stop:  int - value to start or stop dry bicart fill ( start = 1, stop = 0
         @return: 1 if successful, zero otherwise
 
         """
 
-        sts = integer_to_bytearray(start_stop)
-        payload = sts
+        request = integer_to_bytearray(start_stop)
+        reset_byte_array = integer_to_bytearray(reset)
+        payload = reset_byte_array + request
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_DRY_BICART_START_STOP_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         # Send message
@@ -173,4 +185,4 @@
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.error("Timeout!!!!")
-            return False
\ No newline at end of file
+            return False