Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b -rf37bfe2eaf910104d6edfcf46a9771871fbfbc69
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f37bfe2eaf910104d6edfcf46a9771871fbfbc69)
@@ -7,8 +7,8 @@
 *
 * @file    Heaters.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      14-Apr-2026
+* @author  (last)      Sameer Kalliadan Poyil
+* @date    (last)      27-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  11-Oct-2024
@@ -485,17 +485,17 @@
     // finds the delta temperature to be added with the target temperature
     // to maintain the target temperature at dialyzer.
     // Lets calculate the B1,B2 and B3 heat dissipation factors
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
+        heatDissipation_b3 = calculateHeatDissipationB3();
+        heatDissipation_b1b2 = calculateHeatDissipationB1andB2();
+    }
+    else
+    {
         // based on Beta2.0 heat loss model
         heatDissipation_b3 = calculateBeta2HeatDissipationB3();
         heatDissipation_b1b2 = calculateBeta2HeatDissipationB1andB2();
     }
-    else
-    {
-        heatDissipation_b3 = calculateHeatDissipationB3();
-        heatDissipation_b1b2 = calculateHeatDissipationB1andB2();
-    }
 
     // Reverse calculation of target temp at D28 to get the target dialyzer temperature
     targetTempAtD28 = calculateInitialTemp( targetTemp, heatDissipation_b3 );
@@ -521,7 +521,7 @@
         F32 targetTempfromTD            = getTDTargetDialysateTemperature();
         F32 measuredTempAtDialyzer      = 0.0F;
 
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
         {
             measuredTempAtDialyzer      = getTeensyConductivityTemperatureValue( D27_COND );
         }
@@ -722,12 +722,12 @@
             if ( D5_HEAT == heater )
             {
                 alarm       = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D5_HEAT_IS_ON;
-                isLevelLow  = ( ( getLevelStatus( D6_LEVL ) != 0 )? FALSE : TRUE );
+                isLevelLow  = ( ( getFloaterStatus( D6_LEVL ) != LVL_STATE_EMPTY ) ? FALSE : TRUE );
             }
             else
             {
                 alarm       = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON;
-                isLevelLow  = ( ( getLevelStatus( D46_LEVL ) != 0 )? FALSE : TRUE );
+                isLevelLow  = ( ( getLevelStatus( D46_LEVL ) != LEVEL_STATE_LOW ) ? FALSE : TRUE );
             }
 
             checkPersistentAlarm( alarm, isLevelLow, 0.0F, 0.0F );