Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r31b53220d894e272a8f9a8a49d3c9110150489db -r5206a101e662f660baaf6dc919441916c4a4c966
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 31b53220d894e272a8f9a8a49d3c9110150489db)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 5206a101e662f660baaf6dc919441916c4a4c966)
@@ -23,6 +23,8 @@
 #include "Timers.h"
 // TODO: For testing only REMOVE
 
+//TODO change the incoming water for ranges
+
 // Private variables
 
 #define PRIMARY_HEATER_EXT_TEMP_SENSORS_GAIN                    16U                                     ///< Primary heater external temperature sensors gain
@@ -71,7 +73,6 @@
 
 #define EXTERNAL_TEMP_SENSORS_ERROR_VALUE                       0x80                                    ///< External temperature sensors error value
 #define HEATERS_INTERNAL_TEMP_SENSOR_FAULT                      0x01                                    ///< Heaters internal temperature sensor fault
-#define TEMP_SENSORS_INTERVAL_COUNT                             20U                                     ///< Temperature sensors interval count
 
 /// Temperature sensor self test states
 typedef enum tempSensors_Self_Test_States
@@ -107,7 +108,6 @@
 static F32                            temperatureValues [ NUM_OF_TEMPERATURE_SENSORS ];
 static U32                            readAndErrorCounts [ NUM_OF_TEMPERATURE_SENSORS ]
                                                          [ NUM_OF_READ_AND_ERROR_ARRAY_COLUMNS ];
-static U32                            tempSensorsPublicationTimerCounter;
 
 // Private functions prototypes
 
@@ -120,7 +120,6 @@
 
 static F32 getADC2TempConversion ( F32 avgADC, U32 gain, U32 refResistance, U32 zeroDegResistance );
 static void processADCRead ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount );
-static void publishTemperatureData ( void );
 
 // Public functions
 
@@ -140,7 +139,6 @@
     tempSensorsSelfTestState  = TEMPSENSORS_SELF_TEST_START;
     tempSensorsExecState      = TEMPSENSORS_EXEC_STATE_START;
     sampleCount               = 0;
-    tempSensorsPublicationTimerCounter = 0;
 
     // Initialize TPi and TPo constants
     for ( i = TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR; i < TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR; i++ )
@@ -352,7 +350,7 @@
 {
     U32 error;
     U32 heatersTemperature;
-    BOOL isADCValid = TRUE; //TODO make this false
+    BOOL isADCValid = TRUE;
     F32 temperature;
 
 
@@ -389,12 +387,12 @@
             {
                 // TODO: alarm?
             }
-            isADCValid = FALSE;
+            //isADCValid = FALSE;
         }
         if ( error == EXTERNAL_TEMP_SENSORS_ERROR_VALUE )
         {
             //tODO: FILL UP
-            isADCValid = FALSE;
+            //isADCValid = FALSE;
         }
     }
     // It is a heaters temperature sensor
@@ -593,46 +591,12 @@
     // Add a byte array to have bits for each sensor to find out exactly what sensor failed
     processADCRead( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR,    getFPGATPiTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() );
     processADCRead( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR,   getFPGATPoTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() );
-    //processADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR,   getFPGACD1Temp() );
-    //processADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_2_TEMP_SENSOR,   getFPGACD2Temp() );
+    processADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR,   getFPGACD1Temp(), 0, 0 );
+    processADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_2_TEMP_SENSOR,   getFPGACD2Temp(), 0, 0 );
     //processADCRead( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR,       getFPGATHDoTemp() );
     //processADCRead( TEMPSENSORS_INLET_DIALYSATE_TEMP_SENSOR,         getFPGATDiTemp() );
     //processADCRead( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP_SENSOR, getFPGAPrimaryHeaterTemp() );
     //processADCRead( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP_SESNOR, getFPGATrimmerHeaterTemp() );
 
-    publishTemperatureData();
-
     return state;
 }
-/*************************************************************************
- * @brief publishTemperatureData
- * The publishTemperatureData function publishes the temperature sensors
- * data into the USB debug port at the defined time interval
- * @details
- * Inputs : none
- * Outputs : none
- * @param none
- * @return none
- *************************************************************************/
-static void publishTemperatureData ( void )
-{
-    if ( ++tempSensorsPublicationTimerCounter >= TEMP_SENSORS_INTERVAL_COUNT )
-    {
-#ifdef DEBUG_ENABLED
-    {
-        char debugTempStr[ 256 ];
-        sprintf( debugTempStr, "TPi: %6.2f, TPo: %6.2f, TD1: %6.2f, TD2: %6.2f, TRo: %6.2f, TDi: %6.2f, Tph: %6.2f, Tth: %6.2f\r\n",
-                               temperatureValues [ TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ],
-                               temperatureValues [ TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR ],
-                               temperatureValues [ TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR ],
-                               temperatureValues [ TEMPSENSORS_CONDUCTIVITY_SENSOR_2_TEMP_SENSOR ],
-                               temperatureValues [ TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR ],
-                               temperatureValues [ TEMPSENSORS_INLET_DIALYSATE_TEMP_SENSOR ],
-                               temperatureValues [ TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP_SENSOR ],
-                               temperatureValues [ TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP_SESNOR ] );
-        sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) );
-    }
-#endif
-        tempSensorsPublicationTimerCounter = 0;
-    }
-}