Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -r586ff9faf7f89ca792f86e39b4805b5888b2855b
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 586ff9faf7f89ca792f86e39b4805b5888b2855b)
@@ -1,25 +1,29 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2026 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    Conductivity.h
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      10-Sep-2024
+* @author  (last)      “rkallala”
+* @date    (last)      09-Dec-2025
 *
 * @author  (original)  Vinayakam Mani
-* @date    (original)  10-Sep-2024
+* @date    (original)  13-Sep-2024
 *
 ***************************************************************************/
 
 #ifndef __CONDUCTIVITY_H__
 #define __CONDUCTIVITY_H__
 
 #include "DDCommon.h"
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+#include "ConductivityTeensy.h"
+#else
 #include "ConductivitySensors.h"
+#endif
 
 /**
  *  @defgroup Conductivity Conductivity
@@ -33,6 +37,9 @@
 
 // ********** public definitions **********
 
+#define RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE        100.0F   ///< Out of range value for RO rejection ratio when CPi conductivity is zero.
+
+#pragma pack(push, 1)
 /// Conductivity data struct.
 typedef struct
 {
@@ -50,19 +57,36 @@
     F32 p18Conductivity;                                      ///< (P18) conductivity sensor value
 } FP_CONDUCTIVITY_DATA_T;
 
+/// RO rejection ratio data struct.
+typedef struct
+{
+    F32 rawRORejectionRatio;                                 ///< RO rejection ratio during tank full and fill state
+    F32 rawRORejectionRatioTankFill;                         ///< RO rejection ratio during tank fill state
+    F32 avgRORejectionRatio;                                 ///< RO rejection ratio average during tank full and fill state
+    F32 avgRORejectionRatioTankFill;                         ///< RO rejection ratio average during tank fill state
+    U32 genPermeateState;                                    ///< Permeate tank state
+} RO_REJECTION_RATIO_DATA_T;
+#pragma pack(pop)
+
 // ********** public function prototypes **********
 
 void initConductivity( void );
 void execConductivity( void );
 F32 getFilteredConductivity( CONDUCTIVITY_SENSORS_T sensor );
 F32 getFilteredConductivitySensorTemperature( CONDUCTIVITY_SENSORS_T sensor );
+F32 getRORejectonRatio( void );
+F32 getTankFillRORejectionRatio( void );
+F32 getRORRAverage( void );
+F32 getTankFillRORRAverage( void );
 
 BOOL testDDConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testDDConductivitySensorFilteredReadingsOverride( MESSAGE_T *message );
 BOOL testDDConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
 BOOL testFPConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testFPConductivitySensorFilteredReadingsOverride( MESSAGE_T *message );
 BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testRORejectionRatioDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testRORejectionRatioFilteredOverride( MESSAGE_T *message );
 
 /**@}*/