Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -rf0f1a6557cb07e31eb26bb8f8c70e87902f30626 -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision f0f1a6557cb07e31eb26bb8f8c70e87902f30626)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
@@ -7,38 +7,34 @@
 #
 # @file    levels.py
 #
-# @author  (last)      Michael Garthwaite
-# @date    (last)      28-Oct-2024
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      09-Jan-2026
 # @author  (original)  Dara Navaei
 # @date    (original)  29-May-2020
 #
 ############################################################################
 
 import struct
-from enum import unique
 from logging import Logger
 
-from .constants import NO_RESET
+from leahi_dialin.common.constants import NO_RESET
+from leahi_dialin.common.fp_defs import fp_enum_repository
 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.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
+from leahi_dialin.protocols.CAN import DenaliChannels
+from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
 class FPLevels(AbstractSubSystem):
     """
-
         Dialin API sub-class for levels related commands.
     """
 
     def __init__(self, can_interface, logger: Logger):
         """
-
         @param can_interface: Denali CAN Messenger object
         """
-
         super().__init__()
 
         self.can_interface = can_interface
@@ -50,10 +46,11 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_level_data, self._handler_levels_sync)
 
         self.fp_levels = {
-            FPFloaterLevelSensorNames.P25_LEVEL.name: 0
+            fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name: 0
         }
         self.fp_levels_timestamp = 0
 
+
     @publish(["msg_id_fp_level_data",
               "fp_levels",
               "fp_levels_timestamp"])
@@ -64,11 +61,12 @@
         @param message:  published levels data message
         @returns none
         """
-        self.fp_levels[FPFloaterLevelSensorNames.P25_LEVEL.name] = struct.unpack('i', bytearray(
+        self.fp_levels[fp_enum_repository.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
 
+
     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.
@@ -80,29 +78,16 @@
         @param reset: (int) 1 to reset a previous override, 0 to override
         @returns 1 if successful, zero otherwise
         """
-        if not check_broadcast_interval_override_ms(ms):
-            return False
+        return cmd_generic_broadcast_interval_override(
+            ms = ms,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            msg_id = MsgIds.MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+            module_name = 'FP Levels',
+            logger = self.logger,
+            can_interface = self.can_interface)
 
-        reset_value = integer_to_bytearray(reset)
-        interval_value = integer_to_bytearray(ms)
-        payload = reset_value + interval_value
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              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))
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content in message
-        if received_message is not None:
-            # Response payload is OK or not
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
-
     def cmd_level_status_override(self, status: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends level status override command.
@@ -115,17 +100,13 @@
         reset_value = integer_to_bytearray(reset)
         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_FP_LEVEL_OVERRIDE_REQUEST.value,
-                                              payload=payload)
 
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content in message
-        if received_message is not None:
-            # Response payload is OK or not
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
+        return cmd_generic_override(
+            payload = payload,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            msg_id = MsgIds.MSG_ID_FP_FLOW_RATE_OVERRIDE_REQUEST,
+            entity_name = f'FP Levels status',
+            override_text = f'{str(status)}',
+            logger = self.logger,
+            can_interface = self.can_interface)