Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rcc9b6f5543a7523b2173eeb5c12e81916b3e1027 -r2046b91dd8e5255afa2e97684de2819931c45ac4
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision cc9b6f5543a7523b2173eeb5c12e81916b3e1027)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 2046b91dd8e5255afa2e97684de2819931c45ac4)
@@ -8,7 +8,7 @@
 * @file    ConductivitySensors.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      07-Apr-2023
+* @date    (last)      14-Apr-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  13-Jul-2020
@@ -60,8 +60,7 @@
 #define MAX_CONDUCTIVITY_SENSOR_FAILURES                2                                           ///< maximum number of conductivity sensor errors within window period before alarm.
 #define MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS       ( 60 * MS_PER_SECOND )                      ///< Conductivity sensor error window.
 
-#define COND_SENSOR_PERSISTENCE_PERIOD                  ( 5 * MS_PER_SECOND )                       ///< Persistence period for conductivity sensor out of range error.
-#define INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS ( 5 * MS_PER_SECOND )                       ///< Inlet water conductivity sensor out of range timeout in milliseconds.
+#define INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS ( 30 * MS_PER_SECOND )                      ///< Inlet water conductivity sensor out of range timeout in milliseconds.
 #define INLET_WATER_COND_SENSOR_OUT_OF_RANGE_CLEAR_MS   ( 1 * MS_PER_SECOND )                       ///< Inlet water conductivity sensor out of range clear in milliseconds.
 
 #define EMSTAT_PICO_MEASUREMENT_OFFSET                  0x8000000                                   ///< Emstat measurement offset.
@@ -208,8 +207,8 @@
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, MAX_CONDUCTIVITY_SENSOR_FAILURES, MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS );
     initPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_COND_SENSOR_OUT_OF_RANGE_TIMEOUT_MS );
 
     // Initialize the conductivity sensors' FPGA alarms
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPI_CPO_COND_SENSORS, ALARM_ID_DG_CPI_CPO_SENSORS_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );