Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -rc4e1d97e73dd863ddffe895833d209e172b5ae4a -rbc22e4fbb56800101e22ac1752c2f1b67541ba02
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision c4e1d97e73dd863ddffe895833d209e172b5ae4a)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision bc22e4fbb56800101e22ac1752c2f1b67541ba02)
@@ -349,13 +349,13 @@
         {
             CONDUCTIVITY_SENSORS_T sensor = ( DIAL_TEMP_D28 == i ? D27_COND : D29_COND );
 
-            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
             {
-                temperatureC = getTeensyConductivityTemperatureValue( sensor );
+                temperatureC = getConductivityTemperature( sensor );
             }
             else
             {
-                temperatureC = getConductivityTemperature( sensor );
+                temperatureC = getTeensyConductivityTemperatureValue( sensor );
             }
 
             currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex;
@@ -482,30 +482,45 @@
         data.d99Temp        = getTemperatureValue( D99_TEMP );
         data.boardTemp      = getTemperatureValue( BRD_TEMP );
 
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
         {
-            data.d16CondTemp    = getTeensyConductivityTemperatureValue( D17_COND );
-            data.d28CondTemp    = getTeensyConductivityTemperatureValue( D27_COND );
-            data.d30CondTemp    = getTeensyConductivityTemperatureValue( D29_COND );
-            data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
-            data.d75CondTemp    = getConductivityTemperature( 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 );
         }
+        else
+        {
+            data.d16CondTemp    = getTeensyConductivityTemperatureValue( D17_COND );
+            data.d28CondTemp    = getTeensyConductivityTemperatureValue( D27_COND );
+            data.d30CondTemp    = getTeensyConductivityTemperatureValue( D29_COND );
+            data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
+            data.d75CondTemp    = getConductivityTemperature( D74_COND );
+        }
 
         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_1_9_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 );