Address further review comments from JamesH

project-chip · Jul 28, 2024 · c13aca1 · c13aca1
1 parent 44c333f
commit c13aca1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/include/WhmManufacturer.h b/examples/all-clusters-app/all-clusters-common/include/WhmManufacturer.h
@@ -120,7 +120,6 @@ class WhmManufacturer
 
 private:
     WaterHeaterManagementInstance * mWhmInstance;
-    bool mBoostActive;
 };
 
 /** @brief Helper function to return the singleton WhmManufacturer instance

diff --git a/examples/all-clusters-app/all-clusters-common/src/WhmManufacturer.cpp b/examples/all-clusters-app/all-clusters-common/src/WhmManufacturer.cpp
@@ -43,8 +43,6 @@ CHIP_ERROR WhmManufacturer::Init()
         return CHIP_ERROR_UNINITIALIZED;
     }
 
-    mBoostActive = false;
-
     dg->SetHeaterTypes(BitMask<WaterHeaterTypeBitmap>(WaterHeaterTypeBitmap::kImmersionElement1));
     dg->SetHeatDemand(BitMask<WaterHeaterDemandBitmap>(WaterHeaterDemandBitmap::kImmersionElement1));
     dg->SetEstimatedHeatRequired(10000);
@@ -109,13 +107,10 @@ Status WhmManufacturer::TurnHeatingOn(bool emergencyBoost)
 
     WaterHeaterManagementDelegate * dg = GetWhmDelegate();
 
-    if (dg->GetBoostState() == BoostStateEnum::kActive)
-    {
-        mBoostActive = true;
-    }
-
     if (emergencyBoost)
     {
+        // emergencyBoost that the consumer wants the water to be heated as quickly as practicable.
+        // Thus, cause multiple heat sources to be activated
         dg->SetHeatDemand(BitMask<WaterHeaterDemandBitmap>(WaterHeaterDemandBitmap::kImmersionElement1,
                                                            WaterHeaterDemandBitmap::kImmersionElement2));
     }
@@ -133,11 +128,6 @@ Status WhmManufacturer::TurnHeatingOff()
 
     ChipLogProgress(AppServer, "WhmManufacturer::TurnHeatingOff");
 
-    if (mBoostActive)
-    {
-        mBoostActive = false;
-    }
-
     WaterHeaterManagementDelegate * dg = GetWhmDelegate();
 
     dg->SetHeatDemand(BitMask<WaterHeaterDemandBitmap>(0));