Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r94789b2f2324d5901685b6ff7b6224d4af3a0276 -rc90f3d61bde2a2b47d1048635be4dadf282e2195
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 94789b2f2324d5901685b6ff7b6224d4af3a0276)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision c90f3d61bde2a2b47d1048635be4dadf282e2195)
@@ -497,10 +497,25 @@
         data.d4AvgTemp      = getFilteredTemperatureValue( D4_TEMP );
         data.d50AvgTemp     = getFilteredTemperatureValue( D50_TEMP );
         data.d99AvgTemp     = getFilteredTemperatureValue( D99_TEMP );
-        data.d28AvgTemp     = dialTempMovingAvgData[ DIAL_TEMP_D28 ].dialTempAvgC;
+        //data.d28AvgTemp     = dialTempMovingAvgData[ DIAL_TEMP_D28 ].dialTempAvgC;
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        {
+            data.d28AvgTemp = getTeensyConductivityTemperatureValue( D27_COND );
+        }
+        else
+        {
+            data.d28AvgTemp = getFilteredConductivitySensorTemperature( D27_COND );
+        }
+
         data.d30AvgTemp     = dialTempMovingAvgData[ DIAL_TEMP_D30 ].dialTempAvgC;
         data.d78AvgTemp     = getFilteredTemperatureValue( D78_TEMP );
+
+#ifdef __USE_D1_TEMP_
+        data.d9PresTemp     = getFilteredTemperatureValue( D1_TEMP );
+#else
         data.d9PresTemp     = getFilteredPressureSensorTemperature( D9_PRES );
+#endif
+
         data.d66PresTemp    = getFilteredPressureSensorTemperature( D66_PRES );
         data.d51PresTemp    = getFilteredPressureSensorTemperature( D51_PRES );
         data.d18PresTemp    = getFilteredPressureSensorTemperature( D18_PRES );