Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -r3fa7efb8799333684f48d5a894a703db2e3aa945 -r72de2cfa37decafea02ad19a52e44aca5d3da024
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 3fa7efb8799333684f48d5a894a703db2e3aa945)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 72de2cfa37decafea02ad19a52e44aca5d3da024)
@@ -15,7 +15,7 @@
 *
 ***************************************************************************/
 
-#include <math.h>               // Used for calculating the polynomial calibration equation and INF
+#include <math.h>               // Used for log() and INF
 #include <string.h>             // For memcpy
 
 #include "sci.h"
@@ -56,12 +56,12 @@
 #define COND_STATUS_TIMEOUT_MS              ( 10 * MS_PER_SECOND )                     ///< Timeout before which we should receive acknowledgment from teensy
 #define COND_DATA_TIMEOUT_MS                ( 10 * MS_PER_SECOND )                     ///< Timeout before which we should receive data from teensy
 #define COND_TEMP_OFFSET                    25                                         ///< Temperature offset constant used in RTD calculations.
-#define COND_CONVERSION_SM_TO_USCM          1000000.0F                                ///< Conductivity conversion from siemens per meter to micro siemens per centimeter.
+#define COND_CONVERSION_SM_TO_USCM          1000000.0F                                 ///< Conductivity conversion from siemens per meter to micro siemens per centimeter.
 #define COND_INFINITE_R_VALUE               800000                                     ///< Resistance value for when the driver detects INF from the sensor.
 
 // ********** private data **********
 
-static COND_COMM_STATE_T condCommState;                                                ///< current Conductivity driver comm state.
+static COND_COMM_STATE_T condCommState;                                                ///< Current Conductivity driver comm state.
 
 static U32  condInitTime;                                                              ///< Tracks duration of init state.
 static U32  condResponseTime;                                                          ///< Tracks duration between cmd sent and its response received.
@@ -1835,6 +1835,10 @@
         case D43_COND:
             sensorNum = TEENSY_SENSOR_5;
             break;
+        default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID, sensorId )
+            break;
+
     }
 
     return sensorNum;
@@ -1846,23 +1850,21 @@
    impedance value.
  * @details \b Inputs: condCalculatedMeasurement
  * @details \b Outputs: none
- * @param sensor ID of conductivity sensor to get conductivity.
+ * @param sensorId ID of conductivity sensor to get conductivity.
  * @return The current conductivity of a given conductivity sensor.
  *************************************************************************/
 F32 getTeensyConductivityValue( CONDUCTIVITY_SENSORS_T sensorId )
 {
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
 
-    if ( D74_COND != sensorId )
+    result = condCalculatedMeasurement[ sensorNum ].Conductivity.data;
+    if ( OVERRIDE_KEY == condCalculatedMeasurement[ sensorNum ].Conductivity.override )
     {
-        result = condCalculatedMeasurement[ sensorNum ].Conductivity.data;
-        if ( OVERRIDE_KEY == condCalculatedMeasurement[ sensorNum ].Conductivity.override )
-        {
-            result = condCalculatedMeasurement[ sensorNum ].Conductivity.ovData;
-        }
+        result = condCalculatedMeasurement[ sensorNum ].Conductivity.ovData;
     }
 
+
     return result;
 }
 
@@ -1880,15 +1882,13 @@
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
 
-    if ( D74_COND != sensorId )
+    result = condCalculatedMeasurement[ sensorNum ].Temperature.data;
+    if ( OVERRIDE_KEY == condCalculatedMeasurement[ sensorNum ].Temperature.override )
     {
-        result = condCalculatedMeasurement[ sensorNum ].Temperature.data;
-        if ( OVERRIDE_KEY == condCalculatedMeasurement[ sensorNum ].Temperature.override )
-        {
-            result = condCalculatedMeasurement[ sensorNum ].Temperature.ovData;
-        }
+        result = condCalculatedMeasurement[ sensorNum ].Temperature.ovData;
     }
 
+
     return result;
 }
 
@@ -1906,13 +1906,10 @@
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
 
-    if ( D74_COND != sensorId )
+    result = condCalculatedMeasurement[ sensorNum ].Resistance.data;
+    if ( OVERRIDE_KEY == condCalculatedMeasurement[ sensorNum ].Resistance.override )
     {
-        result = condCalculatedMeasurement[ sensorNum ].Resistance.data;
-        if ( OVERRIDE_KEY == condCalculatedMeasurement[ sensorNum ].Resistance.override )
-        {
-            result = condCalculatedMeasurement[ sensorNum ].Resistance.ovData;
-        }
+        result = condCalculatedMeasurement[ sensorNum ].Resistance.ovData;
     }
 
     return result;