Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -r9ac39d94327325e5b882318bc0e5126668eec66e -rd9c41496bfba02f66b6b38a8ecae8c017f160235
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 9ac39d94327325e5b882318bc0e5126668eec66e)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision d9c41496bfba02f66b6b38a8ecae8c017f160235)
@@ -20,6 +20,7 @@
 
 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
@@ -48,19 +49,21 @@
             msg_id = MsgIds.MSG_ID_FP_LEVEL_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id, 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",])
+                "fp_levels",])
     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