Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -raa57954b051832ccde447e46463baf87487c316b -r77740bc2ccace473a471515cadd4bc1353360cd6
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision aa57954b051832ccde447e46463baf87487c316b)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 77740bc2ccace473a471515cadd4bc1353360cd6)
@@ -20,37 +20,19 @@
 from collections import OrderedDict
 
 from .constants import NO_RESET
+from leahi_dialin.common.fp_defs import FPValveStates, FPValveNames
 from leahi_dialin.common.msg_defs import MsgIds
 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
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
+
 # Valve states
 ENERGIZED = True
 DEENERGIZED = False
 
 
-@unique
-class FPValveStates(DialinEnum):
-    VALVE_STATE_CLOSED = 0
-    VALVE_STATE_OPEN = 1
-
-
-@unique
-class FPValveNames(DialinEnum):
-    M4_VALV = 0                             # Valve (M4 VWi)
-    P39_VALV = 1                            # Valve (P39 VROd)
-    P6_VALV = 2                             # Valve (P6 VFF)
-    P11_VALV = 3                            # Valve (P11 VPi)
-    P33_VALV = 4                            # Valve (P33 VCr)
-    P34_VALV = 5                            # Valve (P34 VCb)
-    P37_VALV = 6                            # Valve (P37 VCd)
-    M7_VALV = 7                             # Valve (M7)
-    P20_VALV = 8                            # Valve (P20)
-    P43_VALV = 9                            # Valve (P43)
-    NUM_OF_VALVES = 10                      # Number of valves
-
 class FPValves(AbstractSubSystem):
     """
         Dialin API sub-class for FP valve related commands.