Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9 -r1a719e5c0a00853453a57ebd7b01cc6394ebbcc5
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 1a719e5c0a00853453a57ebd7b01cc6394ebbcc5)
@@ -25,15 +25,7 @@
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_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):
+class ROLevels(AbstractSubSystem):
     """
 
         Dialin API sub-class for levels related commands.
@@ -50,15 +42,15 @@
         self.can_interface = can_interface
         self.logger = logger
 
+        self.p25_level = 0
+        self.ro_levels_timestamp = 0
+
         if self.can_interface is not None:
-            channel_id = DenaliChannels.fp_sync_broadcast_ch_id
+            channel_id = DenaliChannels.ro_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.p25_level = 0
-        self.fp_levels_timestamp = 0
-
-    @publish(["fp_levels_timestamp",
+    @publish(["ro_levels_timestamp",
                 "p25_level",])
     def _handler_levels_sync(self, message, timestamp=0.0):
         """
@@ -70,14 +62,14 @@
         self.p25_level = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
-        self.fp_levels_timestamp = timestamp
+        self.ro_levels_timestamp = timestamp
 
     def cmd_levels_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
-        Constructs and sends an FP levels data broadcast interval override command message.
+        Constructs and sends an RO levels data broadcast interval override command message.
         Constraints:
-            Must be logged into FP.
-            Given interval must be non-zero and a multiple of the FP general task interval (50 ms).
+            Must be logged into RO.
+            Given interval must be non-zero and a multiple of the RO general task interval (50 ms).
 
         @param ms: (int) Publish time interval in ms
         @param reset: (int) 1 to reset a previous override, 0 to override
@@ -90,11 +82,11 @@
         interval_value = integer_to_bytearray(ms)
         payload = reset_value + interval_value
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id,
                                               message_id=MsgIds.MSG_ID_RO_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
-        self.logger.debug("Sending {} ms publish interval to the FP Levels module".format(ms))
+        self.logger.debug("Sending {} ms publish interval to the RO Levels module".format(ms))
         # Send message
         received_message = self.can_interface.send(message)
 
@@ -109,17 +101,18 @@
     def cmd_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends level status override command.
-            Must be logged into FP.
+            Must be logged into RO.
 
         @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)
-        payload = reset_value + lvl
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
+        lvl = integer_to_bytearray(level_sensor)
+        sts = integer_to_bytearray(status)
+        payload = reset_value + sts + lvl
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id,
                                               message_id=MsgIds.MSG_ID_RO_LEVELS_STATUS_OVERRIDE_REQUEST.value,
                                               payload=payload)