Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -rb0e4d949c06f54ca8bb301268398249a5f787426 -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision b0e4d949c06f54ca8bb301268398249a5f787426)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
@@ -7,23 +7,23 @@
 #
 # @file    temperature_sensors.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      28-Jul-2023
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      09-Jan-2026
 # @author  (original)  Dara Navaei
 # @date    (original)  01-Dec-2021
 #
 ############################################################################
+
 import struct
-from enum import unique
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.global_vars import GlobalVariables
 from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-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, float_to_bytearray
 
 
@@ -35,13 +35,11 @@
         self.can_interface = can_interface
         self.logger = logger
 
-
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_sync_broadcast_ch_id
             self.msg_id_fp_temperature_data = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_temperature_data,
                                                                        self._handler_temperature_sensors_sync)
-
         self.fp_temperature_sensors_timestamp = 0
         self.fp_temperatures = {
             fp_enum_repository.FPTemperatureSensorNames.M3_TEMP.name: 0.0,
@@ -92,6 +90,7 @@
 
         self.fp_temperature_sensors_timestamp = timestamp
 
+
     def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends broadcast time interval.
@@ -103,30 +102,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_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+            module_name = 'FP Temperature Sensors',
+            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_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
-            payload=payload)
-
-        self.logger.debug("Sending {} ms publish interval to the Temperature Sensors 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_temperatures_value_override(self, sensor_index: int, sensor_value: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the value override of a temperature sensor.
@@ -138,7 +123,6 @@
         @param sensor_value: (float) Value of the sensor to override
         @param reset: (int) whether to reset the override value. The default is NO_RESET
         @returns 1 if successful, zero otherwise
-
         """
         rst = integer_to_bytearray(reset)
         value = float_to_bytearray(sensor_value)
@@ -164,19 +148,12 @@
         payload = rst + value + index
            
         sensor_name = fp_enum_repository.FPTemperatureSensorNames(sensor_index).name.split('_')[0]
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                                  message_id=msg_id.value,
-                                                  payload=payload)
-
-        self.logger.debug("Setting sensor {} to {} C".format(sensor_name, sensor_value))
-
-        # 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
\ No newline at end of file
+        return cmd_generic_override(
+            payload = payload,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            msg_id = msg_id,
+            entity_name = f'FP {sensor_name} Temperature Sensor temperature',
+            override_text = str(sensor_value),
+            logger = self.logger,
+            can_interface = self.can_interface)