Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r7c0309a22098e7c4b0ef1599fc737f6f8929b9ac -rd27c40205e18118f4689f62463a266da1f91dba6
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 7c0309a22098e7c4b0ef1599fc737f6f8929b9ac)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision d27c40205e18118f4689f62463a266da1f91dba6)
@@ -15,11 +15,11 @@
 ############################################################################
 import struct
 from logging import Logger
-from enum import unique
 
 from .constants import RESET, NO_RESET
+from leahi_dialin.common.dd_defs import dd_enum_repository
+from leahi_dialin.common.global_vars import GlobalVariables
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.dd_defs import DDConductivitySensorsEnum
 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
@@ -50,12 +50,14 @@
                                                                        self._handler_conductivity_sensors_sync)
 
         self.dd_conductivity = {
-            DDConductivitySensorsEnum.D17_COND.name: 0.0,
-            DDConductivitySensorsEnum.D27_COND.name: 0.0,
-            DDConductivitySensorsEnum.D29_COND.name: 0.0,
-            DDConductivitySensorsEnum.D43_COND.name: 0.0,
-            DDConductivitySensorsEnum.D74_COND.name: 0.0
+            dd_enum_repository.DDConductivitySensorNames.D17_COND.name: 0.0,
+            dd_enum_repository.DDConductivitySensorNames.D27_COND.name: 0.0,
+            dd_enum_repository.DDConductivitySensorNames.D29_COND.name: 0.0,
+            dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0,
+            dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0
         }
+        if GlobalVariables.NEXT_GEN_HW:
+            self.fp_temperatures[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0
 
         self.dd_conductivity_timestamp = 0.0
 
@@ -69,21 +71,25 @@
         @return: None
         """
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D17_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D17_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D27_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D27_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D29_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D29_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D43_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D43_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-        self.dd_conductivity[DDConductivitySensorsEnum.D74_COND.name] = struct.unpack('f', bytearray(
+        self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
+        if GlobalVariables.NEXT_GEN_HW:
+            self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.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:
@@ -155,7 +161,7 @@
             str_res = "reset back to normal"
         else:
             str_res = str(conductivity) + " microsiemens/cm"
-        self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum(sensor_index).name
+        self.logger.debug("override conductivity sensor value for sensor " + dd_enum_repository.DDConductivitySensorNames(sensor_index).name
                           + ": " + str_res)
 
         # Send message
@@ -196,7 +202,7 @@
             str_res = "reset back to normal"
         else:
             str_res = str(counter)
-        self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum[str(sensor_index)].name
+        self.logger.debug("override conductivity sensor value for sensor " + dd_enum_repository.DDConductivitySensorNames[str(sensor_index)].name
                           + ": " + str_res)
 
         # Send message
@@ -234,7 +240,7 @@
             str_res = "reset back to normal"
         else:
             str_res = str(counter)
-        self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum[str(sensor_index)].name
+        self.logger.debug("override conductivity sensor value for sensor " + dd_enum_repository.DDConductivitySensorNames[str(sensor_index)].name
                           + ": " + str_res)
 
         # Send message