Address review comments from Boris

Author: PeterC1965

examples/energy-management-app/energy-management-common/include/DeviceEnergyManagementDelegateImpl.h

@@ -54,16 +54,16 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
      * @param duration The duration that the ESA SHALL maintain the requested power for.
      * @return  Success if the adjustment is accepted; otherwise the command SHALL be rejected with appropriate error.
      */
-    virtual chip::Protocols::InteractionModel::Status PowerAdjustRequest(const int64_t powerMw, const uint32_t durationS,
-                                                                         AdjustmentCauseEnum cause) override;
+    chip::Protocols::InteractionModel::Status PowerAdjustRequest(const int64_t powerMw, const uint32_t durationS,
+                                                                 AdjustmentCauseEnum cause) override;
 
     /**
      * @brief Make the ESA end the active power adjustment session & return to normal (or idle) power levels.
      *        The ESA SHALL also generate an PowerAdjustEnd Event and the ESAState SHALL be restored to Online.
      *
      * @return It should report SUCCESS if successful and FAILURE otherwise.
      */
-    virtual chip::Protocols::InteractionModel::Status CancelPowerAdjustRequest() override;
+    chip::Protocols::InteractionModel::Status CancelPowerAdjustRequest() override;
 
     /**
      * @brief The ESA SHALL update its Forecast attribute with the RequestedStartTime including a new ForecastID.
@@ -81,8 +81,8 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
      * @return Success if the StartTime in the Forecast is updated, otherwise the command SHALL be rejected with appropriate
      * IM_Status.
      */
-    virtual chip::Protocols::InteractionModel::Status StartTimeAdjustRequest(const uint32_t requestedStartTimeUtc,
-                                                                             AdjustmentCauseEnum cause) override;
+    chip::Protocols::InteractionModel::Status StartTimeAdjustRequest(const uint32_t requestedStartTimeUtc,
+                                                                     AdjustmentCauseEnum cause) override;
 
     /**
      * @brief Handler for PauseRequest command
@@ -97,7 +97,7 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
      * @param duration Duration that the ESA SHALL be paused for.
      * @return  Success if the ESA is paused, otherwise returns other IM_Status.
      */
-    virtual chip::Protocols::InteractionModel::Status PauseRequest(const uint32_t durationS, AdjustmentCauseEnum cause) override;
+    chip::Protocols::InteractionModel::Status PauseRequest(const uint32_t durationS, AdjustmentCauseEnum cause) override;
 
     /**
      * @brief Handler for ResumeRequest command
@@ -108,7 +108,7 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
      *
      * @return  Success if the ESA is resumed, otherwise returns other IM_Status.
      */
-    virtual chip::Protocols::InteractionModel::Status ResumeRequest() override;
+    chip::Protocols::InteractionModel::Status ResumeRequest() override;
 
     /**
      * @brief Handler for ModifyForecastRequest
@@ -126,7 +126,7 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
      * @return  Success if the entire list of SlotAdjustmentStruct are accepted, otherwise the command
      *          SHALL be rejected returning other IM_Status.
      */
-    virtual chip::Protocols::InteractionModel::Status
+    chip::Protocols::InteractionModel::Status
     ModifyForecastRequest(const uint32_t forecastID,
                           const DataModel::DecodableList<Structs::SlotAdjustmentStruct::DecodableType> & slotAdjustments,
                           AdjustmentCauseEnum cause) override;
@@ -142,7 +142,7 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
      * @param constraints  Sequence of turn up/down power requests that the ESA is being asked to constrain its operation within.
      * @return  Success if successful, otherwise the command SHALL be rejected returning other IM_Status.
      */
-    virtual chip::Protocols::InteractionModel::Status
+    chip::Protocols::InteractionModel::Status
     RequestConstraintBasedForecast(const DataModel::DecodableList<Structs::ConstraintsStruct::DecodableType> & constraints,
                                    AdjustmentCauseEnum cause) override;
 
@@ -163,22 +163,23 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
      *
      * @return  Success if successful, otherwise the command SHALL be rejected returning other IM_Status.
      */
-    virtual chip::Protocols::InteractionModel::Status CancelRequest() override;
+    chip::Protocols::InteractionModel::Status CancelRequest() override;
 
     // ------------------------------------------------------------------
     // Overridden DeviceEnergyManagement::Delegate Get attribute methods
-    virtual ESATypeEnum GetESAType() override;
-    virtual bool GetESACanGenerate() override;
-    virtual ESAStateEnum GetESAState() override;
-    virtual int64_t GetAbsMinPower() override;
-    virtual int64_t GetAbsMaxPower() override;
-    virtual const DataModel::Nullable<Structs::PowerAdjustCapabilityStruct::Type> & GetPowerAdjustmentCapability() override;
-    virtual const DataModel::Nullable<Structs::ForecastStruct::Type> & GetForecast() override;
-    virtual OptOutStateEnum GetOptOutState() override;
+
+    ESATypeEnum GetESAType() override;
+    bool GetESACanGenerate() override;
+    ESAStateEnum GetESAState() override;
+    int64_t GetAbsMinPower() override;
+    int64_t GetAbsMaxPower() override;
+    const DataModel::Nullable<Structs::PowerAdjustCapabilityStruct::Type> & GetPowerAdjustmentCapability() override;
+    const DataModel::Nullable<Structs::ForecastStruct::Type> & GetForecast() override;
+    OptOutStateEnum GetOptOutState() override;
 
     // ------------------------------------------------------------------
     // Overridden DeviceEnergyManagement::Delegate Set attribute methods
-    virtual CHIP_ERROR SetESAState(ESAStateEnum) override;
+    CHIP_ERROR SetESAState(ESAStateEnum) override;
 
     // Local Set methods
     CHIP_ERROR SetESAType(ESATypeEnum);

examples/energy-management-app/energy-management-common/include/EnergyTimeUtils.h

@@ -46,7 +46,7 @@ CHIP_ERROR GetEpochTS(uint32_t & chipEpoch);
  * @param   unixEpoch (as time_t)
  *
  * @return  bitmap value for day of week
- * Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
+ * Sunday = 0x00, Monday = 0x01 ... Saturday = 0x40 (1<<6)
  */
 uint8_t GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch);
 
@@ -55,7 +55,7 @@ uint8_t GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch);
  *
  * @param   reference to hold the day of week as a bitmap
  *
- * Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
+ * Sunday = 0x00, Monday = 0x01 ... Saturday = 0x40 (1<<6)
  */
 CHIP_ERROR GetLocalDayOfWeekNow(uint8_t & dayOfWeekMap);
 

examples/energy-management-app/energy-management-common/include/FakeReadings.h

@@ -42,11 +42,11 @@ class FakeReadings
      * @param[in]   aCurrentRandomness_mA  This is used to define the max randomness of the
      *                             random current values
      * @param[in]   aInterval_s  - the callback interval in seconds
-     * @param[in]   bReset       - boolean: true will reset the energy values to 0
+     * @param[in]   aReset       - boolean: true will reset the energy values to 0
      */
     void StartFakeReadings(chip::EndpointId aEndpointId, int64_t aPower_mW, uint32_t aPowerRandomness_mW, int64_t aVoltage_mV,
                            uint32_t aVoltageRandomness_mV, int64_t aCurrent_mA, uint32_t aCurrentRandomness_mA, uint8_t aInterval_s,
-                           bool bReset);
+                           bool aReset);
 
     /**
      * @brief   Stops any active updates to the fake load data callbacks

examples/energy-management-app/energy-management-common/src/DEMTestEventTriggers.cpp

@@ -63,14 +63,14 @@ CHIP_ERROR ConfigureForecast(uint16_t numSlots)
     }
 
     // planned start time, in UTC, for the entire Forecast.
-    sForecastStruct.startTime = static_cast<uint32_t>(chipEpoch);
+    sForecastStruct.startTime = chipEpoch;
 
     // earliest start time, in UTC, that the entire Forecast can be shifted to. null value indicates that it can be started
     // immediately.
     sForecastStruct.earliestStartTime = MakeOptional(DataModel::MakeNullable(chipEpoch));
 
     // planned end time, in UTC, for the entire Forecast.
-    sForecastStruct.endTime = static_cast<uint32_t>(chipEpoch * 3);
+    sForecastStruct.endTime = chipEpoch * 3;
 
     // latest end time, in UTC, for the entire Forecast
     sForecastStruct.latestEndTime = MakeOptional(chipEpoch * 3);
@@ -133,11 +133,8 @@ CHIP_ERROR ConfigureForecast(uint16_t numSlots)
 
     sForecastStruct.slots = DataModel::List<const DeviceEnergyManagement::Structs::SlotStruct::Type>(sSlots, numSlots);
 
-    DataModel::Nullable<DeviceEnergyManagement::Structs::ForecastStruct::Type> forecast(sForecastStruct);
-
     EVSEManufacturer * mn = GetEvseManufacturer();
-    mn->GetDEMDelegate()->SetForecast(forecast);
-
+    mn->GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
     mn->GetDEMDelegate()->SetAbsMinPower(1000);
     mn->GetDEMDelegate()->SetAbsMaxPower(256 * 2000 * 1000);
 
@@ -216,9 +213,7 @@ void SetTestEventTrigger_StartTimeAdjustment()
     // Latest end time, in UTC, for the entire Forecast which is > sForecastStruct.endTime
     sForecastStruct.latestEndTime = Optional<uint32_t>(static_cast<uint32_t>(chipEpoch * 3 + 60));
 
-    DataModel::Nullable<DeviceEnergyManagement::Structs::ForecastStruct::Type> forecast(sForecastStruct);
-
-    GetDEMDelegate()->SetForecast(forecast);
+    GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
 }
 
 void SetTestEventTrigger_StartTimeAdjustmentClear()
@@ -232,9 +227,7 @@ void SetTestEventTrigger_StartTimeAdjustmentClear()
     sForecastStruct.earliestStartTime = Optional<DataModel::Nullable<uint32_t>>();
     sForecastStruct.latestEndTime     = Optional<uint32_t>();
 
-    DataModel::Nullable<DeviceEnergyManagement::Structs::ForecastStruct::Type> forecast(sForecastStruct);
-
-    GetDEMDelegate()->SetForecast(forecast);
+    GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
 }
 
 void SetTestEventTrigger_UserOptOutOptimization(OptOutStateEnum optOutState)
@@ -253,9 +246,7 @@ void SetTestEventTrigger_PausableNextSlot()
     sForecastStruct = GetDEMDelegate()->GetForecast().Value();
     sForecastStruct.activeSlotNumber.SetNonNull(1);
 
-    DataModel::Nullable<DeviceEnergyManagement::Structs::ForecastStruct::Type> forecast(sForecastStruct);
-
-    GetDEMDelegate()->SetForecast(forecast);
+    GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
 }
 
 void SetTestEventTrigger_Forecast()
@@ -273,9 +264,7 @@ void SetTestEventTrigger_ForecastClear()
     sForecastStruct.activeSlotNumber.SetNull();
     sForecastStruct.slots = DataModel::List<const DeviceEnergyManagement::Structs::SlotStruct::Type>();
 
-    DataModel::Nullable<DeviceEnergyManagement::Structs::ForecastStruct::Type> forecast(sForecastStruct);
-
-    GetDEMDelegate()->SetForecast(forecast);
+    GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
 }
 
 void SetTestEventTrigger_ForecastAdjustment()
@@ -291,18 +280,15 @@ void SetTestEventTrigger_ForecastAdjustment()
 
     sForecastStruct.slots = DataModel::List<const DeviceEnergyManagement::Structs::SlotStruct::Type>(sSlots, 2);
 
-    DataModel::Nullable<DeviceEnergyManagement::Structs::ForecastStruct::Type> forecast(sForecastStruct);
-
-    GetDEMDelegate()->SetForecast(forecast);
+    GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
 }
 
 void SetTestEventTrigger_ForecastAdjustmentNextSlot()
 {
     sForecastStruct = GetDEMDelegate()->GetForecast().Value();
     sForecastStruct.activeSlotNumber.SetNonNull(sForecastStruct.activeSlotNumber.Value() + 1);
-    DataModel::Nullable<DeviceEnergyManagement::Structs::ForecastStruct::Type> forecast(sForecastStruct);
 
-    GetDEMDelegate()->SetForecast(forecast);
+    GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
 }
 
 void SetTestEventTrigger_ConstraintBasedAdjustment()