Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r90f9b4334fd2c3e51dbe204b3b5e224ce5e88588 -r20c821bd230fc7689a0275a2918981669ff5cc19
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 90f9b4334fd2c3e51dbe204b3b5e224ce5e88588)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
@@ -19,7 +19,7 @@
 from collections import OrderedDict
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_VALVE_OFFSET
+from leahi_dialin.common import fp_enum_repository, BETA_IOFP_VALVE_OFFSET
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
@@ -50,47 +50,29 @@
         super().__init__()
         self.can_interface = can_interface
         self.logger = logger
-        self.valves_sensed_states = OrderedDict()
-        self.fp_valves_states_timestamp = 0.0
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_sync_broadcast_ch_id
             self.msg_id_fp_valves_states_data = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_valves_states_data, self._handler_valves_sync)
 
-        self.valve_states_all = 0x0000
-        self.m4_valv = {"id": fp_enum_repository.FPValveNames.M4_VALV.value, "state": DEENERGIZED}
-        self.m12_valv = {"id": fp_enum_repository.FPValveNames.M12_VALV.value, "state": DEENERGIZED}
-        self.p11_valv = {"id": fp_enum_repository.FPValveNames.P11_VALV.value, "state": DEENERGIZED}
-        self.p33_valv = {"id": fp_enum_repository.FPValveNames.P33_VALV.value, "state": DEENERGIZED}
-        self.p34_valv = {"id": fp_enum_repository.FPValveNames.P34_VALV.value, "state": DEENERGIZED}
-        self.p37_valv = {"id": fp_enum_repository.FPValveNames.P37_VALV.value, "state": DEENERGIZED}
-        self.p39_valv = {"id": fp_enum_repository.FPValveNames.P39_VALV.value, "state": DEENERGIZED}
-        self.p6_valv = {"id": fp_enum_repository.FPValveNames.P6_VALV.value, "state": DEENERGIZED}
+        self.fp_valves_states_timestamp = 0.0                                                           #: The timestamp of the last message
+        self.valve_states_all = 0x0000                                                                  #: States of all the vales in binary format
+        self.valves_sensed_states = OrderedDict()                                                       #: The Valve's Sensed State data in dictionary format
+        self.m4_valv = {"id": fp_enum_repository.FPValveNames.M4_VALV.value, "state": DEENERGIZED}      #: The M4 valve's value
+        self.m12_valv = {"id": fp_enum_repository.FPValveNames.M12_VALV.value, "state": DEENERGIZED}    #: The M12 valve's value
+        self.p11_valv = {"id": fp_enum_repository.FPValveNames.P11_VALV.value, "state": DEENERGIZED}    #: The P11 valve's value
+        self.p33_valv = {"id": fp_enum_repository.FPValveNames.P33_VALV.value, "state": DEENERGIZED}    #: The P33 valve's value
+        self.p34_valv = {"id": fp_enum_repository.FPValveNames.P34_VALV.value, "state": DEENERGIZED}    #: The P34 valve's value
+        self.p37_valv = {"id": fp_enum_repository.FPValveNames.P37_VALV.value, "state": DEENERGIZED}    #: The P37 valve's value
+        self.p39_valv = {"id": fp_enum_repository.FPValveNames.P39_VALV.value, "state": DEENERGIZED}    #: The P39 valve's value
+        self.p6_valv = {"id": fp_enum_repository.FPValveNames.P6_VALV.value, "state": DEENERGIZED}      #: The P6 valve's value
 
-        # NOTE: The len function counts the enums with the same number only once.
+        #: States of all the vales in list format
         self.valve_states_enum = [0 for _ in range(fp_enum_repository.FPValveNames.NUM_OF_FP_VALVES.value - 1)]
 
         for valve in fp_enum_repository.FPValveNames.__members__:
             self.valves_sensed_states[valve] = ''
-
-
-    def get_valve_states(self):
-        """
-        Gets the valve states
-
-        @return: All valve states
-        """
-        return [
-            self.m4_valv.get("state"),
-            self.m12_valv.get("state"),
-            self.p11_valv.get("state"),
-            self.p33_valv.get("state"),
-            self.p34_valv.get("state"),
-            self.p37_valv.get("state"),
-            self.p39_valv.get("state"),
-            self.p6_valv.get("state")
-        ]
     
     
     @staticmethod