Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r46a42611591cb92eef5f20c8d39964d406c5c8cc -rae31b4c999dccae70fb40fb9d98a4380ce2c7415
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 46a42611591cb92eef5f20c8d39964d406c5c8cc)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision ae31b4c999dccae70fb40fb9d98a4380ce2c7415)
@@ -16,11 +16,6 @@
 ***************************************************************************/
 
 #include "BalancingChamber.h"
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-#include "ConductivityTeensy.h"
-#else
-#include "ConductivitySensors.h"
-#endif
 #include "Conductivity.h"
 #include "Flow.h"
 #include "Messaging.h"
@@ -345,7 +340,14 @@
         d50TempSampleIntervalCounter                 = 0;
     }
 
+    F32 d50Temp                                  = getTemperatureValue( D50_TEMP );
+    d50TempSamplesC[ d50TempSamplesNextIndex ]   = d50Temp;
+    d50TempRunningSumC                           += d50Temp;
+    d50TempSamplesNextIndex                      = INC_WRAP( d50TempSamplesNextIndex, 0, D50_TEMP_MOVING_AVG_NUM_OF_SAMPLES - 1 );
+    d50TempCount                                 = INC_CAP( d50TempCount, D50_TEMP_MOVING_AVG_NUM_OF_SAMPLES );
+    d50TempAvgC                                  = d50TempRunningSumC / (F32)d50TempCount;
 
+
     // Moving average sample collection interval varies based on the dialysate flow rate
     if ( ++d99TempSampleIntervalCounter >= tempDataCollectionTimeInterval )
     {
@@ -380,6 +382,8 @@
 {
     DIAL_TEMPERATURE_SENSORS_T i;
     F32 temperatureC = 0.0F;
+    U32 currentIndex = 0;
+    F32 prevSampleToRemoveC = 0.0f;
 
     for ( i = DIAL_TEMP_FIRST; i < NUM_OF_DIAL_TEMPS; i++ )
     {
@@ -392,22 +396,18 @@
         {
             CONDUCTIVITY_SENSORS_T sensor = ( DIAL_TEMP_D28 == i ? D27_COND : D29_COND );
 
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-
-            if (sensor != D74_COND)
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
             {
                 temperatureC = getTeensyConductivityTemperatureValue( sensor );
             }
             else
             {
-                temperatureC = getConductivityTemperatureValue( sensor );
+                temperatureC = getConductivityTemperature( sensor );
             }
-#else
-            temperatureC = getConductivityTemperatureValue( sensor );
-#endif
-            U32 currentIndex             = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex;
-            F32 prevSampleToRemoveC      = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ];
 
+            currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex;
+            prevSampleToRemoveC = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ];
+
             dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS       = getMSTimerCount();
             dialTempMovingAvgData[ i ].dialTempColHasTimerBeenSet       = TRUE;
             dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ] = temperatureC;
@@ -535,19 +535,24 @@
         data.d50Temp        = getTemperatureValue( D50_TEMP );
         data.d99Temp        = getTemperatureValue( D99_TEMP );
         data.boardTemp      = getTemperatureValue( BRD_TEMP );
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-        data.d16CondTemp    = getTeensyConductivityTemperatureValue( D17_COND );
-        data.d28CondTemp    = getTeensyConductivityTemperatureValue( D27_COND );
-        data.d30CondTemp    = getTeensyConductivityTemperatureValue( D29_COND );
-        data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
-        data.d75CondTemp    = getConductivityTemperatureValue( D74_COND );
-#else
-        data.d16CondTemp    = getConductivityTemperatureValue( D17_COND );
-        data.d28CondTemp    = getConductivityTemperatureValue( D27_COND );
-        data.d30CondTemp    = getConductivityTemperatureValue( D29_COND );
-        data.d44CondTemp    = getConductivityTemperatureValue( D43_COND );
-        data.d75CondTemp    = getConductivityTemperatureValue( D74_COND );
-#endif
+
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        {
+            data.d16CondTemp    = getTeensyConductivityTemperatureValue( D17_COND );
+            data.d28CondTemp    = getTeensyConductivityTemperatureValue( D27_COND );
+            data.d30CondTemp    = getTeensyConductivityTemperatureValue( D29_COND );
+            data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
+            data.d75CondTemp    = getTeensyConductivityTemperatureValue( D74_COND );
+        }
+        else
+        {
+            data.d16CondTemp    = getConductivityTemperature( D17_COND );
+            data.d28CondTemp    = getConductivityTemperature( D27_COND );
+            data.d30CondTemp    = getConductivityTemperature( D29_COND );
+            data.d44CondTemp    = getConductivityTemperature( D43_COND );
+            data.d75CondTemp    = getConductivityTemperature( D74_COND );
+        }
+
         data.d4AvgTemp      = getD4AverageTemperature();
         data.d50AvgTemp     = getD50AverageTemperature();
         data.d99AvgTemp     = getD99AverageTemperature();