Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r7c0309a22098e7c4b0ef1599fc737f6f8929b9ac -rd2697fb12fc381fed6e7fb0820ec6486513243f6
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 7c0309a22098e7c4b0ef1599fc737f6f8929b9ac)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision d2697fb12fc381fed6e7fb0820ec6486513243f6)
@@ -13,16 +13,16 @@
 # @date    (original)  20-Jul-2020
 #
 ############################################################################
+
 import struct
 from logging import Logger
-from enum import unique
 
-from .constants import RESET, NO_RESET
+from leahi_dialin.common.constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.dd_defs import DDConductivitySensorsEnum
+from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override
 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.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
@@ -54,7 +54,8 @@
             DDConductivitySensorsEnum.D27_COND.name: 0.0,
             DDConductivitySensorsEnum.D29_COND.name: 0.0,
             DDConductivitySensorsEnum.D43_COND.name: 0.0,
-            DDConductivitySensorsEnum.D74_COND.name: 0.0
+            DDConductivitySensorsEnum.D74_COND.name: 0.0,
+            DDConductivitySensorsEnum.D98_COND.name: 0.0
         }
 
         self.dd_conductivity_timestamp = 0.0
@@ -84,6 +85,9 @@
         self.dd_conductivity[DDConductivitySensorsEnum.D74_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
+        self.dd_conductivity[DDConductivitySensorsEnum.D98_COND.name] = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
+
         self.dd_conductivity_timestamp = timestamp
 
     def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
@@ -98,36 +102,15 @@
         @return: 1 if successful, zero otherwise
         """
 
-        if not check_broadcast_interval_override_ms(ms):
-            return False
+        cmd_generic_broadcast_interval_override(
+            ms = ms,
+            reset = reset,
+            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+            module_name = 'DD conductivity sensors',
+            logger = self.logger,
+            can_interface = self.can_interface)
 
-        reset_byte_array = integer_to_bytearray(reset)
-        ms_byte_array = integer_to_bytearray(ms)
-        payload = reset_byte_array + ms_byte_array
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
-                                              message_id=MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("override DD conductivity sensor broadcast interval")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content...
-        if received_message is not None:
-            if reset == RESET:
-                str_res = "reset back to normal: "
-            else:
-                str_res = str(ms) + " ms: "
-            self.logger.debug("Conductivity sensor data broadcast interval overridden to " + str_res +
-                              str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
-            # response payload is OK or not OK
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.error("Timeout!!!!")
-            return False
-
     def cmd_conductivity_sensor_readings_override(self, sensor_index: int, conductivity: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the conductivity value override command