Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -re0c45c725884d780b76dd54a617ab6ed333d7ba2 -rae31b4c999dccae70fb40fb9d98a4380ce2c7415
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision e0c45c725884d780b76dd54a617ab6ed333d7ba2)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision ae31b4c999dccae70fb40fb9d98a4380ce2c7415)
@@ -181,13 +181,13 @@
 static COND_PARSE_STATUS parseEEPROMdata( const U08 *buffer, U32 len );
 static COND_PARSE_STATUS parseConductivityMeasurements( const U08 *buffer );
 
-static U32 getTeensyCondId( CONDUCTIVITY_SENSORS_T sensorId );
-static void calculateConductivity( TEENSY_SENSOR_INDEX_T sensorNum );
-static void calculateConductivityAly( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor );
-static void calculateConductivityUpdatedStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor );
-static void calculateConductivityStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor );
-static void calculateTemperature( TEENSY_SENSOR_INDEX_T sensorNum );
-static void calculateResistance( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor );
+static U32 getTeensyCondId( U32 sensorId );
+static void calculateConductivity( U32 sensorNum );
+static void calculateConductivityAly( U32 sensorNum, BOOL isFPSensor );
+static void calculateConductivityUpdatedStandard( U32 sensorNum, BOOL isFPSensor );
+static void calculateConductivityStandard( U32 sensorNum, BOOL isFPSensor );
+static void calculateTemperature( U32 sensorNum );
+static void calculateResistance( U32 sensorNum, BOOL isFPSensor );
 
 /*********************************************************************//**
  * @brief
@@ -838,16 +838,15 @@
 static COND_COMM_STATE_T rxInitSensor( void )
 {
     COND_COMM_STATE_T state = COND_COMM_STATE_RX;
-    COND_INIT_STATUS_T  initStatusInProgress = COND_INIT_STATUS_FAILED; // set to fail for testing
     COND_INIT_STATUS_T  initStatusInitialized = COND_INIT_STATUS_FAILED; // if data populates
     BOOL recvComplete = rxTeensyReadRsp( TEENSY_CMD_INIT_SENSOR );
 
     if ( TRUE == recvComplete )
     {
         // Reset the timer for next use.
         condResponseTime = 0;
-        // Read the data from the receive buffer
-        initStatusInProgress = ( COND_INIT_STATUS_T )condRxBuffer[ 0 ];
+        // Read the data from the receive buffer. Pull 2nd byte as first byte is
+        // discarded.
         initStatusInitialized = ( COND_INIT_STATUS_T )condRxBuffer[ 1 ];
 
         // Store the init status
@@ -1791,12 +1790,12 @@
             // Store Raw value in array index for position ( sensorNum - 1 )
             memcpy( &condRawMeasurement[ tempSensor.sensorNum - 1 ], &tempSensor, sizeof( COND_SENSOR_DATA_T ) );
 
-            // Calculate and store Conductivity from raw values
-            calculateConductivity( tempSensor.sensorNum - 1 );
-
             // Calculate and store Temperature from raw values.
             calculateTemperature( tempSensor.sensorNum - 1 );
 
+            // Calculate and store Conductivity from raw values
+            calculateConductivity( tempSensor.sensorNum - 1 );
+
             parseStatus = COND_PARSE_SUCCESS;
         }
     }
@@ -1812,7 +1811,7 @@
  * @param sensorId - Id of DD Conductivity Sensors
  * @return sensorNum - Sensor Index.
  *************************************************************************/
-static U32 getTeensyCondId( CONDUCTIVITY_SENSORS_T sensorId )
+static U32 getTeensyCondId( U32 sensorId )
 {
     U32 sensorNum = 0;
 
@@ -1854,7 +1853,7 @@
  * @param sensorId ID of conductivity sensor to get conductivity.
  * @return The current conductivity of a given conductivity sensor.
  *************************************************************************/
-F32 getTeensyConductivityValue( CONDUCTIVITY_SENSORS_T sensorId )
+F32 getTeensyConductivityValue( U32 sensorId )
 {
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
@@ -1877,7 +1876,7 @@
  * @param sensorId ID of conductivity sensor to get temperature.
  * @return The current temperature of a given conductivity sensor.
  *************************************************************************/
-F32 getTeensyConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensorId )
+F32 getTeensyConductivityTemperatureValue( U32 sensorId )
 {
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
@@ -1900,7 +1899,7 @@
  * @param sensorId ID of conductivity sensor to get temperature.
  * @return The current temperature of a given conductivity sensor.
  *************************************************************************/
-F32 getTeensyConductivityResistanceValue( CONDUCTIVITY_SENSORS_T sensorId )
+F32 getTeensyConductivityResistanceValue( U32 sensorId )
 {
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
@@ -1923,7 +1922,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateConductivity( TEENSY_SENSOR_INDEX_T sensorNum )
+static void calculateConductivity( U32 sensorNum )
 {
     BOOL isFPSensor = FALSE;
 
@@ -1956,7 +1955,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateConductivityAly( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor )
+static void calculateConductivityAly( U32 sensorNum, BOOL isFPSensor )
 {
     F32 calculatedConductivity = 0.0;
     F32 B3 = 0.0;
@@ -1973,6 +1972,11 @@
     {
         R = COND_INFINITE_R_VALUE;
     }
+    // To prevent nan's being thrown into our rolling average by dividing by 0, we set to 1.
+    else if ( R == 0 )
+    {
+        R = 1;
+    }
 
     if ( TRUE == isFPSensor )
     {
@@ -2009,7 +2013,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateConductivityUpdatedStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor )
+static void calculateConductivityUpdatedStandard( U32 sensorNum, BOOL isFPSensor )
 {
     F32 calculatedConductivity = 0.0;
     F64 alpha = 0.0;
@@ -2043,20 +2047,25 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateConductivityStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor )
+static void calculateConductivityStandard( U32 sensorNum, BOOL isFPSensor )
 {
     F32 calculatedConductivity = 0.0;
     F64 alpha = 0.0;
     F64 k = 0.0;
     F32 R  = condRawMeasurement[ sensorNum ].impRzMag;
 
-    // Aly sensors are known to send the driver INF in unfavorable conditions for impedance. e.g: open air
+    // Sensors are known to send the driver INF in unfavorable conditions for impedance. e.g: open air
     // Change it to some high value that can be determined that we are reading INF.
     // Otherwise we will publish no updated value or 0.
     if ( R == INFINITY )
     {
         R = COND_INFINITE_R_VALUE;
     }
+    // To prevent nan's being thrown into our rolling average by dividing by 0, we set to 1.
+    else if ( R == 0 )
+    {
+        R = 1;
+    }
 
     if ( TRUE == isFPSensor )
     {
@@ -2087,7 +2096,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateResistance( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor )
+static void calculateResistance( U32 sensorNum, BOOL isFPSensor )
 {
 
     F32 calculatedResistance = 0.0;
@@ -2126,7 +2135,7 @@
  * @param sensorNum - Teensy sensor index value.
  * @return
  *************************************************************************/
-static void calculateTemperature( TEENSY_SENSOR_INDEX_T sensorNum )
+static void calculateTemperature( U32 sensorNum )
 {
 
     F32 calculatedTemperature = 0.0;
@@ -2160,7 +2169,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( payload.index <= LAST_FP_COND_SENSOR )
+    if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS )
     {
         // D74 is not connected to Teensy and does not have a data structure to override.
         if ( LAST_DD_COND_SENSOR != payload.index )
@@ -2170,13 +2179,13 @@
             {
                 F32 value = payload.state.f32;
 
-                condCalculatedMeasurement[ payload.index ].Conductivity.ovData = value;
-                condCalculatedMeasurement[ payload.index ].Conductivity.override = OVERRIDE_KEY;
+                condCalculatedMeasurement[ getTeensyCondId( payload.index ) ].Conductivity.ovData = value;
+                condCalculatedMeasurement[ getTeensyCondId( payload.index ) ].Conductivity.override = OVERRIDE_KEY;
             }
             else
             {
-                condCalculatedMeasurement[ payload.index ].Conductivity.override = OVERRIDE_RESET;
-                condCalculatedMeasurement[ payload.index ].Conductivity.ovData = condCalculatedMeasurement[ payload.index ].Conductivity.ovInitData;
+                condCalculatedMeasurement[ getTeensyCondId( payload.index ) ].Conductivity.override = OVERRIDE_RESET;
+                condCalculatedMeasurement[ getTeensyCondId( payload.index ) ].Conductivity.ovData = condCalculatedMeasurement[ payload.index ].Conductivity.ovInitData;
             }
         }
     }
@@ -2199,7 +2208,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( payload.index <= LAST_FP_COND_SENSOR )
+    if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS )
     {
         // D74 is not connected to Teensy and does not have a data structure to override.
         if ( LAST_DD_COND_SENSOR != payload.index )
@@ -2239,7 +2248,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( payload.index <= LAST_FP_COND_SENSOR )
+    if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS )
     {
         // D74 is not connected to Teensy and does not have a data structure to override.
         if ( LAST_DD_COND_SENSOR != payload.index )