EVSE add get set clear targets support

examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp

@@ -23,14 +23,24 @@ using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::EnergyEvse;
 
 static std::unique_ptr<EnergyEvseDelegate> gDelegate;
+static std::unique_ptr<EvseTargetsDelegate> gEvseTargetsDelegate;
 static std::unique_ptr<EnergyEvseManager> gInstance;
 
 void emberAfEnergyEvseClusterInitCallback(chip::EndpointId endpointId)
 {
     VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
+    VerifyOrDie(!gDelegate);
+    VerifyOrDie(!gEvseTargetsDelegate);
     VerifyOrDie(!gInstance);
 
-    gDelegate = std::make_unique<EnergyEvseDelegate>();
+    gEvseTargetsDelegate = std::make_unique<EvseTargetsDelegate>();
+    if (!gEvseTargetsDelegate)
+    {
+        ChipLogError(AppServer, "Failed to allocate memory for EvseTargetsDelegate");
+        return;
+    }
+
+    gDelegate = std::make_unique<EnergyEvseDelegate>(*gEvseTargetsDelegate);
     if (gDelegate)
     {
         gInstance = std::make_unique<EnergyEvseManager>(

examples/all-clusters-app/ameba/chip_main.cmake

@@ -182,6 +182,7 @@ list(
     ${chip_dir}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp
     ${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp
     ${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp
+    ${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp
 
     ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c
     ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c

examples/all-clusters-app/asr/BUILD.gn

@@ -87,6 +87,7 @@ asr_executable("clusters_app") {
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
     "${examples_plat_dir}/ButtonHandler.cpp",
     "${examples_plat_dir}/CHIPDeviceManager.cpp",
     "${examples_plat_dir}/LEDWidget.cpp",

examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn

@@ -92,6 +92,7 @@ ti_simplelink_executable("all-clusters-app") {
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
     "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
     "${project_dir}/main/AppTask.cpp",
     "${project_dir}/main/ClusterManager.cpp",

examples/all-clusters-app/cc13x4_26x4/BUILD.gn

@@ -95,6 +95,7 @@ ti_simplelink_executable("all-clusters-app") {
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
     "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
     "${project_dir}/main/AppTask.cpp",
     "${project_dir}/main/ClusterManager.cpp",

examples/all-clusters-app/infineon/psoc6/BUILD.gn

@@ -123,6 +123,7 @@ psoc6_executable("clusters_app") {
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
     "${examples_plat_dir}/LEDWidget.cpp",
     "${examples_plat_dir}/init_psoc6Platform.cpp",
     "src/AppTask.cpp",

examples/all-clusters-app/linux/BUILD.gn

@@ -62,6 +62,7 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/device-energy-management-mode.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/energy-evse-mode.cpp",
     "AllClustersCommandDelegate.cpp",

examples/all-clusters-app/mbed/CMakeLists.txt

@@ -75,6 +75,7 @@ target_sources(${APP_TARGET} PRIVATE
                ${ENERGY_MANAGEMENT_COMMON}/src/ElectricalPowerMeasurementDelegate.cpp
                ${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseDelegateImpl.cpp
                ${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseManager.cpp
+               ${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseTargetsStore.cpp
                ${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementDelegateImpl.cpp
                ${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementManager.cpp
 

examples/all-clusters-app/nrfconnect/CMakeLists.txt

@@ -75,6 +75,7 @@ target_sources(app PRIVATE
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/ElectricalPowerMeasurementDelegate.cpp
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseDelegateImpl.cpp
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseManager.cpp
+               ${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseTargetsStore.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 
 chip_configure_data_model(app

examples/all-clusters-app/nxp/mw320/BUILD.gn

@@ -91,6 +91,7 @@ mw320_executable("shell_mw320") {
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
     "${chip_root}/src/lib/shell/streamer_mw320.cpp",
     "binding-handler.cpp",
     "include/CHIPProjectConfig.h",

examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn

@@ -119,6 +119,7 @@ rt_executable("all_cluster_app") {
     sources += [
       "${chip_root}/examples/${app_common_folder}/src/EnergyEvseDelegateImpl.cpp",
       "${chip_root}/examples/${app_common_folder}/src/EnergyEvseManager.cpp",
+      "${chip_root}/examples/${app_common_folder}/src/EnergyEvseTargetStore.cpp",
       "${chip_root}/examples/${app_common_folder}/src/bridged-actions-stub.cpp",
       "${chip_root}/examples/${app_common_folder}/src/energy-evse-stub.cpp",
       "${chip_root}/examples/${app_common_folder}/src/smco-stub.cpp",

examples/all-clusters-app/openiotsdk/CMakeLists.txt

@@ -68,6 +68,7 @@ target_sources(${APP_TARGET}
         ${ENERGY_MANAGEMENT_COMMON}/src/ElectricalPowerMeasurementDelegate.cpp
         ${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseDelegateImpl.cpp
         ${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseManager.cpp
+        ${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseTargetsStore.cpp
         ${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementDelegateImpl.cpp
         ${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementManager.cpp        
 )

examples/all-clusters-app/telink/CMakeLists.txt

@@ -88,6 +88,7 @@ target_sources(app PRIVATE
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/ElectricalPowerMeasurementDelegate.cpp
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseDelegateImpl.cpp
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseManager.cpp
+               ${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseTargetsStore.cpp
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementDelegateImpl.cpp
                ${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementManager.cpp                  
                ${TELINK_COMMON}/common/src/mainCommon.cpp

examples/all-clusters-app/tizen/BUILD.gn

@@ -43,6 +43,7 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
     "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
+    "${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
   ]
 
   deps = [

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

@@ -20,6 +20,7 @@
 
 #include "app/clusters/energy-evse-server/energy-evse-server.h"
 #include <EVSECallbacks.h>
+#include <EnergyEvseTargetsStore.h>
 
 #include <app/util/af.h>
 #include <app/util/config.h>
@@ -108,6 +109,7 @@ class EvseSession
 class EnergyEvseDelegate : public EnergyEvse::Delegate
 {
 public:
+    EnergyEvseDelegate(EvseTargetsDelegate & aDelegate) : EnergyEvse::Delegate() { mEvseTargetsDelegate = &aDelegate; }
     ~EnergyEvseDelegate();
 
     /**
@@ -139,6 +141,46 @@ class EnergyEvseDelegate : public EnergyEvse::Delegate
      */
     Status StartDiagnostics() override;
 
+    /**
+     * @brief    Called when EVSE cluster receives the SetTargets command
+     */
+    Status SetTargets(
+        const DataModel::DecodableList<Structs::ChargingTargetScheduleStruct::DecodableType> & chargingTargetSchedules) override;
+
+    EvseTargetsDelegate * GetEvseTargetsDelegate() { return mEvseTargetsDelegate; }
+
+    /**
+     * @brief Delegate should implement a handler to PrepareGetTargets
+     *
+     * This needs to load any stored targets into memory and hold it until the GetTargetsFinished is
+     * called by the cluster server.
+     *
+     * @param  Reference to EvseTargetIterator class that implements the ability
+     *         for the cluster server to iterate through the target entries
+     */
+    CHIP_ERROR PrepareGetTargets(EvseTargetIterator ** iterator) override;
+
+    /**
+     * @brief Delegate should implement a handler to GetTargetsFinished
+     *
+     * This is used by the cluster server to indicate it has finished preparing
+     * the GetTargetsResponse using the iterator and that the memory in the delegate can
+     * freed
+     */
+    CHIP_ERROR GetTargetsFinished() override;
+
+    /**
+     * @brief    Called when EVSE cluster receives ClearTargets command
+     */
+    Status ClearTargets() override;
+
+    /* Helper functions for managing targets*/
+    Status
+    ValidateTargets(const DataModel::DecodableList<Structs::ChargingTargetScheduleStruct::DecodableType> & chargingTargetSchedules);
+
+    Status
+    SaveTargets(const DataModel::DecodableList<Structs::ChargingTargetScheduleStruct::DecodableType> & chargingTargetSchedules);
+
     /**
      * @brief    Called by EVSE Hardware to register a single callback handler
      */
@@ -317,6 +359,9 @@ class EnergyEvseDelegate : public EnergyEvse::Delegate
 
     /* Helper variable to hold meter val since last EnergyTransferStarted event */
     int64_t mMeterValueAtEnergyTransferStart;
+
+    /* Targets Delegate */
+    EvseTargetsDelegate * mEvseTargetsDelegate = nullptr;
 };
 
 } // namespace EnergyEvse

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

@@ -0,0 +1,135 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app/clusters/energy-evse-server/energy-evse-server.h>
+#include <lib/core/CHIPError.h>
+#include <lib/core/CHIPPersistentStorageDelegate.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/CommonIterator.h>
+#include <lib/support/Pool.h>
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <vector>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace EnergyEvse {
+
+class EvseTargetIteratorImpl;
+class EvseTargetsDelegate
+{
+public:
+    using EvseTargetIterator = CommonIterator<EvseTargetEntry>;
+
+    ~EvseTargetsDelegate();
+
+    CHIP_ERROR Init(PersistentStorageDelegate * targetStore);
+    EvseTargetIteratorImpl * GetEvseTargetsIterator();
+    CHIP_ERROR Load(std::vector<EvseTargetEntry> & targetEntryVector, size_t & targetsSize);
+
+    CHIP_ERROR IncreaseEntryCount();
+    CHIP_ERROR DecreaseEntryCount();
+    CHIP_ERROR UpdateEntryCount(bool increase);
+    CHIP_ERROR LoadCounter(size_t & count, size_t & targetsSize);
+    CHIP_ERROR SerializeToTlv(TLV::TLVWriter & writer, const std::vector<EvseTargetEntry> & targetEntryVector);
+
+    /**
+     * @brief   Copies a ChargingTargetSchedule into our store
+     *
+     * @param [in] an entry from the SetTargets list containing:
+     *             dayOfWeekForSequence and chargingTargets (list)
+     *
+     * This routine scans the existing mTargets to see if we have a day of week
+     * set that matches the new target dayOfWeek bits. If there is an existing
+     * matching day then it replaces the days existing targets with the new entry
+     */
+    CHIP_ERROR
+    CopyTarget(const Structs::ChargingTargetScheduleStruct::DecodableType &);
+
+    /**
+     *  @brief   This deletes all targets and resets the list to empty
+     */
+    CHIP_ERROR ClearTargets();
+
+    static constexpr size_t MaxTargetEntryCounterSize()
+    {
+        // All the fields added together
+        return TLV::EstimateStructOverhead(sizeof(size_t), sizeof(size_t));
+    }
+
+    static constexpr size_t MaxTargetEntrySize()
+    {
+        // All the fields added together
+        return TLV::EstimateStructOverhead(sizeof(chip::BitMask<TargetDayOfWeekBitmap>)) +
+            kEvseTargetsMaxNumberOfDays *
+            TLV::EstimateStructOverhead(sizeof(uint16_t), sizeof(Optional<chip::Percent>), sizeof(Optional<int64_t>));
+    }
+
+protected:
+    enum class TargetEntryTag : uint8_t
+    {
+        kTargetEntry           = 1,
+        kDayOfWeek             = 2,
+        kChargingTargetsList   = 3,
+        kChargingTargetsStruct = 4,
+        kTargetTime            = 5,
+        kTargetSoC             = 6,
+        kAddedEnergy           = 7,
+    };
+
+    enum class CounterTag : uint8_t
+    {
+        kCount = 1,
+        kSize  = 2,
+    };
+
+private:
+    // The array itself has a control byte and an end-of-array marker.
+    static constexpr size_t kArrayOverHead = 2;
+
+    EvseTargetIteratorImpl * mEvseTargetsIterator = nullptr;
+    PersistentStorageDelegate * mpTargetStore     = nullptr;
+};
+
+using EvseTargetIterator = CommonIterator<EvseTargetEntry>;
+class EvseTargetIteratorImpl : public EvseTargetIterator
+{
+public:
+    EvseTargetIteratorImpl(EvseTargetsDelegate & aDelegate) : mDelegate(aDelegate)
+    {
+        mTargetEntryIndex = 0;
+        mTargetEntryVector.clear();
+    }
+    size_t Count() override;
+    bool Next(EvseTargetEntry & entry) override;
+    void Release() override;
+    CHIP_ERROR Load();
+
+private:
+    EvseTargetsDelegate & mDelegate;
+    size_t mTargetEntryIndex = 0;
+    std::vector<EvseTargetEntry> mTargetEntryVector;
+};
+
+} // namespace EnergyEvse
+} // namespace Clusters
+} // namespace app
+} // namespace chip