Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r2453a1f92978ed1900becfc0dda2cf5a9b8e8d0b -r92ec01cb48d91fe7315baa987e1aa051dd12df75
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 2453a1f92978ed1900becfc0dda2cf5a9b8e8d0b)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 92ec01cb48d91fe7315baa987e1aa051dd12df75)
@@ -31,7 +31,7 @@
 
 // ********** private definitions **********
 
-#define COND_CPO_SENSOR_PROBE_TYPE                  10                                              ///< 0.1 K cell constant conductivity probe
+#define COND_SENSOR_PROBE_TYPE                      100                                             ///< 1K cell constant conductivity probe
 #define COND_SENSOR_DECIMAL_CONVERSION              100                                             ///< Conductivity value from FPGA has two decimal place
 #define COND_SENSOR_TEMPERATURE_COEF                0.02                                            ///< Linear temperature coefficient of variation at 25 Celcius for fresh water
 #define COND_SENSOR_REFERENCE_TEMPERATURE           25                                              ///< Reference temperature for conductivity sensor
@@ -97,15 +97,16 @@
         compensatedConductivityValues[ i ].ovData = 0.0;
         compensatedConductivityValues[ i ].ovInitData = 0.0;
         compensatedConductivityValues[ i ].override = OVERRIDE_RESET;
+
+        // TODO: Ability to change probe type
+//        setFPGAConductivityProbeType( COND_SENSOR_PROBE_TYPE );
     }
 
     roRejectionRatio.data       = 0.0;
     roRejectionRatio.ovData     = 0.0;
     roRejectionRatio.ovInitData = 0.0;
     roRejectionRatio.override   = OVERRIDE_RESET;
 
-    setFPGACPoProbeType( COND_CPO_SENSOR_PROBE_TYPE );
-
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, MAX_CONDUCTIVITY_SENSOR_FAILURES, MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS );
     initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, ALARM_DATA_TYPE_F32, COND_SENSOR_PERSISTENCE_COUNT, COND_SENSOR_PERSISTENCE_COUNT );
     initPersistentAlarm( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, ALARM_DATA_TYPE_F32, COND_SENSOR_PERSISTENCE_COUNT, COND_SENSOR_PERSISTENCE_COUNT );