Add and use a Energy_mWh type

Author: PeterC1965

examples/all-clusters-app/all-clusters-common/include/WhmDelegate.h

@@ -121,7 +121,7 @@ class WaterHeaterManagementDelegate : public WaterHeaterManagement::Delegate
     BitMask<WaterHeaterHeatSourceBitmap> GetHeaterTypes() override;
     BitMask<WaterHeaterHeatSourceBitmap> GetHeatDemand() override;
     uint16_t GetTankVolume() override;
-    int64_t GetEstimatedHeatRequired() override;
+    Energy_mWh GetEstimatedHeatRequired() override;
     Percent GetTankPercentage() override;
     BoostStateEnum GetBoostState() override;
 
@@ -130,7 +130,7 @@ class WaterHeaterManagementDelegate : public WaterHeaterManagement::Delegate
     void SetHeaterTypes(BitMask<WaterHeaterHeatSourceBitmap> heaterTypes);
     void SetHeatDemand(BitMask<WaterHeaterHeatSourceBitmap> heatDemand);
     void SetTankVolume(uint16_t tankVolume);
-    void SetEstimatedHeatRequired(int64_t estimatedHeatRequired);
+    void SetEstimatedHeatRequired(Energy_mWh estimatedHeatRequired);
     void SetTankPercentage(Percent tankPercentage);
     void SetBoostState(BoostStateEnum boostState);
 
@@ -327,7 +327,7 @@ class WaterHeaterManagementDelegate : public WaterHeaterManagement::Delegate
     // taking the specific heat capacity of water (4182 J/kg °C) and by knowing
     // the current temperature of the water, the tank volume and target
     // temperature.
-    int64_t mEstimatedHeatRequired;
+    Energy_mWh mEstimatedHeatRequired;
 
     // This attribute SHALL indicate an approximate level of hot water stored in
     // the tank, which may help consumers understand the amount of hot water

examples/all-clusters-app/all-clusters-common/src/WhmDelegateImpl.cpp

@@ -67,7 +67,7 @@ uint16_t WaterHeaterManagementDelegate::GetTankVolume()
     return mTankVolume;
 }
 
-int64_t WaterHeaterManagementDelegate::GetEstimatedHeatRequired()
+Energy_mWh WaterHeaterManagementDelegate::GetEstimatedHeatRequired()
 {
     return mEstimatedHeatRequired;
 }
@@ -112,7 +112,7 @@ void WaterHeaterManagementDelegate::SetTankVolume(uint16_t tankVolume)
     }
 }
 
-void WaterHeaterManagementDelegate::SetEstimatedHeatRequired(int64_t estimatedHeatRequired)
+void WaterHeaterManagementDelegate::SetEstimatedHeatRequired(Energy_mWh estimatedHeatRequired)
 {
     if (mEstimatedHeatRequired != estimatedHeatRequired)
     {

src/app/clusters/water-heater-management-server/water-heater-management-server.h

@@ -108,7 +108,7 @@ class Delegate
     virtual BitMask<WaterHeaterHeatSourceBitmap> GetHeaterTypes() = 0;
     virtual BitMask<WaterHeaterHeatSourceBitmap> GetHeatDemand()  = 0;
     virtual uint16_t GetTankVolume()                              = 0;
-    virtual int64_t GetEstimatedHeatRequired()                    = 0;
+    virtual Energy_mWh GetEstimatedHeatRequired()                 = 0;
     virtual Percent GetTankPercentage()                           = 0;
     virtual BoostStateEnum GetBoostState()                        = 0;
 

src/app/util/basic-types.h

@@ -32,5 +32,6 @@ namespace chip {
 
 typedef uint8_t Percent;
 typedef uint16_t Percent100ths;
+typedef int64_t Energy_mWh;
 
 } // namespace chip