Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -rb69ce4225540854eb976e2ac03d2225951e22e3e -rf0f1a6557cb07e31eb26bb8f8c70e87902f30626
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision b69ce4225540854eb976e2ac03d2225951e22e3e)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision f0f1a6557cb07e31eb26bb8f8c70e87902f30626)
@@ -20,19 +20,13 @@
 
 from .constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.fp_defs import FPFloaterLevels, FPFloaterLevelSensorNames
 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, float_to_bytearray
+from leahi_dialin.utils.conversions import integer_to_bytearray
 
-@unique
-class FPFloaterLevels(DialinEnum):
-    LEVEL_STATE_LOW = 0
-    LEVEL_STATE_HIGH = 1
-    LEVEL_STATE_MEDIUM = 2
-    LEVEL_STATE_ILLEGAL = 3
 
-
 class FPLevels(AbstractSubSystem):
     """
 
@@ -52,22 +46,25 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_RO_LEVEL_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_levels_sync)
+            self.msg_id_fp_level_data = MsgIds.MSG_ID_FP_LEVEL_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_level_data, self._handler_levels_sync)
 
-        self.p25_level = 0
+        self.fp_levels = {
+            FPFloaterLevelSensorNames.P25_LEVEL.name: 0
+        }
         self.fp_levels_timestamp = 0
 
-    @publish(["fp_levels_timestamp",
-                "p25_level",])
+    @publish(["msg_id_fp_level_data",
+              "fp_levels",
+              "fp_levels_timestamp"])
     def _handler_levels_sync(self, message, timestamp=0.0):
         """
         Handles published levels message
 
         @param message:  published levels data message
         @returns none
         """
-        self.p25_level = struct.unpack('i', bytearray(
+        self.fp_levels[FPFloaterLevelSensorNames.P25_LEVEL.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
         self.fp_levels_timestamp = timestamp
@@ -91,7 +88,7 @@
         payload = reset_value + interval_value
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("Sending {} ms publish interval to the FP Levels module".format(ms))
@@ -106,21 +103,20 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int:
+    def cmd_level_status_override(self, status: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends level status override command.
             Must be logged into FP.
 
-        @param level_sensor: integer -  the level sensor to override its value
         @param status: integer -  the status value to override
         @param reset: (int) 1 to reset a previous override, 0 to override
         @returns 1 if successful, zero otherwise
         """
         reset_value = integer_to_bytearray(reset)
-        lvl = integer_to_bytearray(level_sensor)
-        payload = reset_value + lvl
+        sts = integer_to_bytearray(status)
+        payload = reset_value + sts
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_LEVEL_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_LEVEL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         # Send message