Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r79f8b1a11dcc2f05a685ca33ba2a53fc4208fb4b -r3749d041224897f9da5a1cfadae7bab81d94437b
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 79f8b1a11dcc2f05a685ca33ba2a53fc4208fb4b)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 3749d041224897f9da5a1cfadae7bab81d94437b)
@@ -419,27 +419,27 @@
                     break;
                 case HW_REV_LOWER_WORD:
                     memcpy( conductivitySensorRevisions[ sensor ].hwRev, &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_LOWER_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_REV_LOWER_WORD ] = TRUE;
                     break;
                 case HW_REV_MID_WORD:
                     memcpy( ( conductivitySensorRevisions[ sensor ].hwRev + LOWER_WORD_SIZE ), &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_MID_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_REV_MID_WORD ] = TRUE;
                     break;
                 case HW_REV_UPPER_WORD:
                     memcpy( ( conductivitySensorRevisions[ sensor ].hwRev + ( LOWER_WORD_SIZE + MID_WORD_SIZE ) ), &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_UPPER_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_REV_UPPER_WORD ] = TRUE;
                     break;
                 case HW_SERIAL_LOWER_WORD:
                     memcpy( conductivitySensorRevisions[ sensor ].hwSerial, &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_LOWER_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_SERIAL_LOWER_WORD ] = TRUE;
                     break;
                 case HW_SERIAL_MID_WORD:
                     memcpy( ( conductivitySensorRevisions[ sensor ].hwSerial + LOWER_WORD_SIZE ), &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_MID_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_SERIAL_MID_WORD ] = TRUE;
                     break;
                 case HW_SERIAL_UPPER_WORD:
                     memcpy( ( conductivitySensorRevisions[ sensor ].hwRev + ( LOWER_WORD_SIZE + MID_WORD_SIZE ) ), &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_UPPER_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_SERIAL_UPPER_WORD ] = TRUE;
                     break;
             }
             // check if we have finished reading all values.
@@ -448,8 +448,8 @@
         // Read all cal values. Check ranges.
         else
         {
-            conductivitySensorStatus[ sensor ].calReadComplete = checkConductivityCoefficientRanges( sensor );
-
+            //conductivitySensorStatus[ sensor ].calReadComplete = checkConductivityCoefficientRanges( sensor );
+            conductivitySensorStatus[ sensor ].calReadComplete = TRUE;
             if ( TRUE == conductivitySensorStatus[ sensor ].calReadComplete )
             {
                 calResult = TRUE;
@@ -791,7 +791,7 @@
  * @param sensorId conductivity sensor id
  * @return conductivity value
  *************************************************************************/
-F32 getConductivityValue( CONDUCTIVITY_SENSORS_T sensor )
+F32 getConductivity( CONDUCTIVITY_SENSORS_T sensor )
 {
     F32 result = 0.0F;
 
@@ -821,7 +821,7 @@
  * @param sensorId conductivity sensor id
  * @return temperature value
  *************************************************************************/
-F32 getConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensor )
+F32 getConductivityTemperature( CONDUCTIVITY_SENSORS_T sensor )
 {
     F32 result = 0.0F;