Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r9434135f30fdd9d073685bf5088bb5c58542c624 -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 9434135f30fdd9d073685bf5088bb5c58542c624)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e)
@@ -21,6 +21,7 @@
 
 from .constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds
+from leahi_dialin.common.dd_defs import DDValveStates, DDValveNames
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -31,43 +32,6 @@
 DEENERGIZED = False
 
 
-@unique
-class DDValveStates(DialinEnum):
-    VALVE_STATE_CLOSED = 0
-    VALVE_STATE_OPEN = 1
-
-
-@unique
-class DDValveNames(DialinEnum):
-    D14_VALV = 0                                 # Valve Hydraulics Outlet (D14)
-    D52_VALV = 1                                 # Valve Thermal Disinfect (D52)
-    D8_VALV = 2                                  # Valve Hydraulics Bypass (D8)
-    D54_VALV  = 3                                # Valve Rinse Port (D54)
-    D53_VALV = 4                                 # Valve Drain (D53)
-    D34_VALV = 5                                 # Valve Dialyzer Bypass (D34)
-    D64_VALV = 6                                 # Valve Purge 1 (D64)
-    D31_VALV = 7                                 # Valve Pressure Test (D31)
-    D65_VALV = 8                                 # Valve DryBcarb Inlet (D65)
-    D35_VALV = 9                                 # Valve Dialyzer Inlet (D35)
-    D40_VALV = 10                                # Valve Dialyzer Outlet (D40)
-    D47_VALV = 11                                # Valve Dialysate Out Purge 2 (D47)
-    D3_VALV = 12                                 # Valve Hydraulics Inlet (D3)
-    M4_VALV = 13                                 # Valve Water Inlet (M4)
-    RSRVD_SPACE1 = 14                            # This space has been reserved
-    RSRVD_SPACE2 = 15                            # This space has been reserved
-    D23_VALV = 16                                # Balancing chamber Valve 1 (D23)
-    D19_VALV = 17                                # Balancing chamber Valve 2 (D19)
-    D25_VALV = 18                                # Balancing chamber Valve 3 (D25)
-    D26_VALV = 19                                # Balancing chamber Valve 7 (D26)
-    D24_VALV = 20                                # Balancing chamber Valve 5 (D24)
-    D20_VALV = 21                                # Balancing chamber Valve 6 (D20)
-    D21_VALV = 22                                # Balancing chamber Valve 4 (D21)
-    D22_VALV = 23                                # Balancing chamber Valve 8 (D22)
-    D69_VALV = 24                                # Ultrafiltration Valve 1 Inlet (D69)
-    D71_VALV = 25                                # Ultrafiltration Valve 2 Inlet (D71)
-    D70_VALV = 26                                # Ultrafiltration Valve 1 Outlet (D70)
-    D72_VALV = 27                                # Ultrafiltration Valve 2 Outlet (D72)
-
 class DDValves(AbstractSubSystem):
     """
     Dialysate Delivery (DD) interface for valve related commands.