Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r94789b2f2324d5901685b6ff7b6224d4af3a0276 -ra03a5119712cea509ec345bd4f650ffcdb9a9438
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 94789b2f2324d5901685b6ff7b6224d4af3a0276)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision a03a5119712cea509ec345bd4f650ffcdb9a9438)
@@ -7,8 +7,8 @@
 *
 * @file    Temperature.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      14-Apr-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  25-Sep-2024
@@ -382,6 +382,7 @@
  *************************************************************************/
 void checkDialysateTemperatureSensors( void )
 {
+#ifndef __D30_TEMPERATURE_DISABLED__
     DD_OP_MODE_T op = getCurrentOperationMode();
 
     if ( ( DD_MODE_GEND == op ) || ( DD_MODE_HEAT == op ) )
@@ -405,6 +406,10 @@
             tempDriftEventCheck = FALSE;
         }
     }
+#else
+    resetPersistentAlarmTimer( ALARM_ID_DD_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE );
+    tempDriftEventCheck = FALSE;
+#endif
 }
 
 /*********************************************************************//**
@@ -497,9 +502,20 @@
         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 );
+        data.d1AvgTemp      = getFilteredTemperatureValue( D1_TEMP );
+
         data.d9PresTemp     = getFilteredPressureSensorTemperature( D9_PRES );
         data.d66PresTemp    = getFilteredPressureSensorTemperature( D66_PRES );
         data.d51PresTemp    = getFilteredPressureSensorTemperature( D51_PRES );