Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -rfa63b92d3d3a3f2870833583bff12729e180e2d1 -r8e3ce4e082f70e12b48d796c518994662f7668b3
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision fa63b92d3d3a3f2870833583bff12729e180e2d1)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 8e3ce4e082f70e12b48d796c518994662f7668b3)
@@ -316,10 +316,10 @@
     D23_VALV                            = 16    # Balancing chamber Valve 1 (D23)
     D19_VALV                            = 17    # Balancing chamber Valve 2 (D19)
     D25_VALV                            = 18    # Balancing chamber Valve 3 (D25)
-    D21_VALV                            = 19    # Balancing chamber Valve 7 (D26)
+    D21_VALV                            = 19    # Balancing chamber Valve 4 (D21)
     D24_VALV                            = 20    # Balancing chamber Valve 5 (D24)
     D20_VALV                            = 21    # Balancing chamber Valve 6 (D20)
-    D26_VALV                            = 22    # Balancing chamber Valve 4 (D21)
+    D26_VALV                            = 22    # Balancing chamber Valve 7 (D26)
     D22_VALV                            = 23    # Balancing chamber Valve 8 (D22)
     D79_PMP_VALV                        = 24    # D79 pump mapped to spare valve 0
     SPARE1_VALV                         = 25    # Spare Valve 1
Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -rfa63b92d3d3a3f2870833583bff12729e180e2d1 -r8e3ce4e082f70e12b48d796c518994662f7668b3
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision fa63b92d3d3a3f2870833583bff12729e180e2d1)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 8e3ce4e082f70e12b48d796c518994662f7668b3)
@@ -126,11 +126,6 @@
     MSG_ID_DD_VOLTAGES_DATA = 0x68
     MSG_ID_DD_RINSE_PUMP_DATA = 0x69
 
-
-
-    MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
-
-
     MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000
     MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001
     MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002
@@ -280,10 +275,7 @@
     MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052
     MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053
 
-    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00
-    MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01
-    MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02
-    # Placeholder message
+    # Placeholder messages
     MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03
     MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04
 
Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -r9c785697827d1a21021b48b57d5a14f157856ec2 -r8e3ce4e082f70e12b48d796c518994662f7668b3
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 9c785697827d1a21021b48b57d5a14f157856ec2)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 8e3ce4e082f70e12b48d796c518994662f7668b3)
@@ -25,7 +25,6 @@
 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
@@ -125,7 +124,6 @@
         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)
Fisheye: Tag 8e3ce4e082f70e12b48d796c518994662f7668b3 refers to a dead (removed) revision in file `leahi_dialin/dd/modules/piston_pump.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tests/unit_tests/test_imports.py
===================================================================
diff -u -r51b54b55fd498d481061cb3e02e312354e970242 -r8e3ce4e082f70e12b48d796c518994662f7668b3
--- tests/unit_tests/test_imports.py	(.../test_imports.py)	(revision 51b54b55fd498d481061cb3e02e312354e970242)
+++ tests/unit_tests/test_imports.py	(.../test_imports.py)	(revision 8e3ce4e082f70e12b48d796c518994662f7668b3)
@@ -47,7 +47,6 @@
         from leahi_dialin.dd.modules.gen_dialysate import DDGenDialysate
         from leahi_dialin.dd.modules.heaters import DDHeaters
         from leahi_dialin.dd.modules.levels import DDLevels
-        from leahi_dialin.dd.modules.piston_pump import DDPistonPumps
         from leahi_dialin.dd.modules.post_gen_dialysate import DDPostGenDialysate
         from leahi_dialin.dd.modules.pre_gen_dialysate import DDPreGenDialysate
         from leahi_dialin.dd.modules.pressure_sensors import DDPressureSensors
@@ -109,7 +108,6 @@
         from leahi_dialin.dd.modules.gen_dialysate import DDGenDialysate
         from leahi_dialin.dd.modules.heaters import DDHeaters
         from leahi_dialin.dd.modules.levels import DDLevels
-        from leahi_dialin.dd.modules.piston_pump import DDPistonPumps
         from leahi_dialin.dd.modules.post_gen_dialysate import DDPostGenDialysate
         from leahi_dialin.dd.modules.pre_gen_dialysate import DDPreGenDialysate
         from leahi_dialin.dd.modules.pressure_sensors import DDPressureSensors