Index: firmware/App/Drivers/ConductivitySensors.h
===================================================================
diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -rc07917caced76b53a0ed8f35167fac6f9d8310a4
--- firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision f5baeac6a5f000705cd51e4779a967acf4088981)
+++ firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision c07917caced76b53a0ed8f35167fac6f9d8310a4)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ConductivitySensors.h
 *
 * @author  (last)      Vinayakam Mani
-* @date    (last)      10-Sep-2024
+* @date    (last)      09-Sep-2025
 *
 * @author  (original)  Vinayakam Mani
-* @date    (original)  10-Sep-2024
+* @date    (original)  13-Sep-2024
 *
 ***************************************************************************/
 
@@ -24,7 +24,7 @@
  *  @defgroup ConductivitySensors ConductivitySensors
  *  @brief Conductivity Sensors monitor module. Monitors and filters conductivity sensor readings.
  *  The module uses AD5941 - high precision, low power analog front ends(AFEs) for conductivity measurement
- *  for CD1,CD2, CD3 and CD4.
+ *  for D17,D27, D29, D43, D74, P9 and P18
  *
  *  Conductivity Sensor Module
  *  Diality P/N: TBD
@@ -40,11 +40,17 @@
 /// Enumeration of conductivity sensors.
 typedef enum ConductivitySensors
 {
-    FIRST_COND_SENSOR = 0,                          ///< First conductivity sensor
-    D17_COND = FIRST_COND_SENSOR,                   ///< Bicarb only conductivity sensor
+    D17_COND = 0,                                   ///< Bicarb only conductivity sensor - 1
+    FIRST_DD_COND_SENSOR = D17_COND,                ///< First conductivity sensor
     D27_COND,                                       ///< Acid and Bicarb mix conductivity sensor - 1
     D29_COND,                                       ///< Acid and Bicarb mix conductivity sensor - 2
     D43_COND,                                       ///< Spent dialysate conductivity sensor
+    D74_COND,                                       ///< Bicarb only conductivity sensor - 2
+    LAST_DD_COND_SENSOR = D74_COND,                 ///< Last conductivity sensor
+    P9_COND,                                        ///< Inlet water conductivity sensor
+    FIRST_FP_COND_SENSOR = P9_COND,                 ///< First FP conductivity sensor
+    P18_COND,                                       ///< RO outlet water conductivity sensor
+    LAST_FP_COND_SENSOR = P18_COND,                 ///< Last FP conductivity sensor
     NUM_OF_CONDUCTIVITY_SENSORS                     ///< Number of conductivity sensors
 } CONDUCTIVITY_SENSORS_T;
 
@@ -69,10 +75,14 @@
 void conductivitySensorReadRequest( CONDUCTIVITY_SENSORS_T sensor, U16 readAddr );
 U32 conductivitySensorReadData( CONDUCTIVITY_SENSORS_T sensor );
 
-BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message );
-BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );
-BOOL testConductivitySensorReadCounterOverride( MESSAGE_T *message );
-BOOL testConductivitySensorErrorCounterOverride( MESSAGE_T *message );
+BOOL testDDConductivitySensorReadingsOverride( MESSAGE_T *message );
+BOOL testDDConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testDDConductivitySensorReadCounterOverride( MESSAGE_T *message );
+BOOL testDDConductivitySensorErrorCounterOverride( MESSAGE_T *message );
+BOOL testFPConductivitySensorReadingsOverride( MESSAGE_T *message );
+BOOL testFPConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testFPConductivitySensorReadCounterOverride( MESSAGE_T *message );
+BOOL testFPConductivitySensorErrorCounterOverride( MESSAGE_T *message );
 
 /**@}*/