Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r5e77ff3ec89af3b613788694bacfcbd874682396 -re7e698ed85055dd286e8c0501a582ff66d601590
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 5e77ff3ec89af3b613788694bacfcbd874682396)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e7e698ed85055dd286e8c0501a582ff66d601590)
@@ -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.
 
@@ -124,7 +124,6 @@
  *************************************************************************/
 void initConductivitySensors( void )
 {
-    /// TODO: Revert back to init state.
     currentConductivityState = CONDUCTIVITY_INIT_STATE;
     CONDUCTIVITY_SENSORS_T sensor;
 
@@ -195,6 +194,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 );
+
 }
 
 /*********************************************************************//**
@@ -356,7 +356,6 @@
     // Check which counter, assign it, and assign read bool to TRUE per sensor
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-
         if ( FALSE == conductivitySensorStatus[ sensor ].haveAllCalSlotsBeenRead )
         {
 
@@ -969,6 +968,7 @@
         alpha = conductivitySensorCoefficients[ sensorNum ].alpha_high;
         k = conductivitySensorCoefficients[ sensorNum ].K_high;
     }
+
     calculateResistance( sensorNum, isFPSensor );
     calculateTemperature( sensorNum );
 
@@ -1244,4 +1244,5 @@
     return result;
 }
 
+
 /**@}*/