Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -re9a789e5cf3e0da840ccd0227fdd482ab5ed338d -r1d9be2f5baf7d1416ef8a79c2ed93a279738f97a
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e9a789e5cf3e0da840ccd0227fdd482ab5ed338d)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 1d9be2f5baf7d1416ef8a79c2ed93a279738f97a)
@@ -52,7 +52,7 @@
 
 #define MAX_CONDUCTIVITY_SENSOR_FAILURES                    2                                           ///< Number of failures before alarming in timed window count.
 #define MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS           ( 60 * MS_PER_SECOND )                      ///< Set time for timed window count.
-#define MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS            ( 500 / TASK_PRIORITY_INTERVAL )            ///< New reading every 333ms, expect to get valid new reading in 500ms.
+#define MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS            ( 800 / TASK_PRIORITY_INTERVAL )            ///< New reading every 333ms, expect to get valid new reading in 500ms.
 #define COND_SENSORS_FPGA_ERROR_TIMEOUT_MS                  ( 2 * MS_PER_SECOND )                       ///< Conductivity sensors FPGA error timeout in milliseconds.
 #define COND_SENSORS_READ_ERR_MAX_CNT                       255                                         ///< Conductivity sensors read and error count max value.
 
@@ -139,7 +139,6 @@
  *************************************************************************/
 void initConductivitySensors( void )
 {
-    /// TODO: Revert back to init state.
     currentConductivityState = CONDUCTIVITY_INIT_STATE;
     CONDUCTIVITY_SENSORS_T sensor;
 
@@ -215,6 +214,7 @@
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_D74_COND_SENSOR, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_P18_COND_SENSOR, ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
+
 }
 
 /*********************************************************************//**
@@ -1060,6 +1060,7 @@
                 break;
         }
     }
+
     calculateResistance( sensorNum, isFPSensor );
     calculateTemperature( sensorNum );
 
@@ -1375,4 +1376,5 @@
     return result;
 }
 
+
 /**@}*/