Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -rba2793fd2b970fc89af085f1dfe4e8b6fe408353 -r79697500614904bafb56f3d33e368b954ba78f7d
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision ba2793fd2b970fc89af085f1dfe4e8b6fe408353)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 79697500614904bafb56f3d33e368b954ba78f7d)
@@ -22,18 +22,20 @@
 from .modules.conductivity_sensors import DDConductivitySensors
 from .modules.constants import NO_RESET, RESET
 from .modules.dialysate_pump import DDDialysatePumps
+from .modules.events import DDEvents
 from .modules.gen_dialysate import DDGenDialysate
 from .modules.heaters import DDHeaters
 from .modules.levels import DDLevels
-from .modules.piston_pump import DDPistonPumps
 from .modules.post_gen_dialysate import DDPostGenDialysate
 from .modules.pressure_sensors import DDPressureSensors
 from .modules.pre_gen_dialysate import DDPreGenDialysate
+from .modules.rinse_pump import DDRinsePump
 from .modules.spent_chamber_fill import DDSpentChamberFill
 from .modules.temperature_sensors import DDTemperatureSensors
 from .modules.dd_test_configs import DDTestConfig
 from .modules.ultrafiltration import DDUltrafiltration
 from .modules.valves import DDValves
+from .modules.voltages import DDVoltages
 
 from .proxies.ro_proxy import ROProxy
 from .proxies.td_proxy import TDProxy
@@ -85,16 +87,18 @@
         # register handler for DD operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_DD_OP_MODE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_dd_op_mode_data = MsgIds.MSG_ID_DD_OP_MODE_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_op_mode_data,
                                                                        self._handler_dd_op_mode_sync)
 
+            self.msg_id_dd_version_response = MsgIds.MSG_ID_DD_VERSION_RESPONSE.value
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_DD_VERSION_RESPONSE.value,
+                                                                       self.msg_id_dd_version_response,
                                                                        self._handler_dd_version_response_sync)
 
+            self.msg_id_dd_debug_event = MsgIds.MSG_ID_DD_DEBUG_EVENT.value
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_DD_DEBUG_EVENT.value,
+                                                                       self.msg_id_dd_debug_event,
                                                                        self._handler_dd_debug_event_sync)
 
         # create properties
@@ -118,24 +122,26 @@
         self.concentrate_pumps = DDConcentratePumps(self.can_interface, self.logger)
         self.conductivity_sensors = DDConductivitySensors(self.can_interface, self.logger)
         self.dialysate_pumps = DDDialysatePumps(self.can_interface, self.logger)
+        self.events = DDEvents(self.can_interface, self.logger)
         self.gen_dialysate = DDGenDialysate(self.can_interface, self.logger)
         self.heaters = DDHeaters(self.can_interface, self.logger)
         self.levels = DDLevels(self.can_interface, self.logger)
-        self.piston_pumps = DDPistonPumps(self.can_interface, self.logger)
         self.post_gen_dialysate = DDPostGenDialysate(self.can_interface, self.logger)
         self.pressure_sensors = DDPressureSensors(self.can_interface, self.logger)
         self.pre_gen_dialysate = DDPreGenDialysate(self.can_interface, self.logger)
+        self.rinse_pump = DDRinsePump(self.can_interface, self.logger)
         self.spent_chamber_fill = DDSpentChamberFill(self.can_interface, self.logger)
         self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger)
         self.test_configs = DDTestConfig(self.can_interface, self.logger)
         self.ultrafiltration = DDUltrafiltration(self.can_interface, self.logger)
         self.valves = DDValves(self.can_interface, self.logger)
+        self.voltages = DDVoltages(self.can_interface, self.logger)
 
         self.ro_proxy = ROProxy(self.can_interface, self.logger)
         self.td_proxy = TDProxy(self.can_interface, self.logger)
 
 
-    @publish(["dd_debug_events_timestamp","dd_debug_events"])
+    @publish(["msg_id_dd_debug_event", "dd_debug_events_timestamp","dd_debug_events"])
     def _handler_dd_debug_event_sync(self, message, timestamp = 0.0):
 
         payload = message['message']
@@ -166,7 +172,7 @@
         """
         self.dd_logged_in = logged_in
 
-    @publish(["dd_op_mode_timestamp","dd_operation_mode", "dd_operation_sub_mode"])
+    @publish(["msg_id_dd_op_mode_data", "dd_op_mode_timestamp","dd_operation_mode", "dd_operation_sub_mode"])
     def _handler_dd_op_mode_sync(self, message, timestamp = 0.0):
         """
         Handles published DD operation mode messages.  Current DD operation mode
@@ -184,7 +190,7 @@
         self.dd_operation_sub_mode = smode[0]
         self.dd_op_mode_timestamp = timestamp
 
-    @publish(["dd_version, dd_fpga_version"])
+    @publish(["msg_id_dd_version_response", "dd_version, dd_fpga_version"])
     def _handler_dd_version_response_sync(self,message, timestamp = 0.0):
         """
         Handler for response from DD regarding its version.
@@ -342,4 +348,4 @@
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.debug("Timeout!!!!")
-            return False
\ No newline at end of file
+            return False