riscv: telink: fix deferred storage compilation errors

fengtai-telink · fengtai-telink · commit 1ff4959d31dc · 2025-03-06T15:35:49.000+08:00
- Fix compilation errors caused by Server::GetInstance() type changes .
 - Ajust the operate instance for deferred storage .
 - Update zephyr commit to 7f064a1 .
 - Adjust the CI target .

Signed-off-by: Fengtai Xie &lt;fengtai.xie@telink-semi.com&gt;
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -111,7 +111,7 @@ jobs:
                 platform: telink
             - name: Update Zephyr to specific revision (for developers purpose)
               shell: bash
-              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 16b157bc4caf9a268caf11481624885f5046263f"
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 7f064a1b02686f050b47e194fde4fc0514507cf6"
             - name: CI Examples Telink
               shell: bash
               run: |
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -58,7 +58,7 @@ jobs:
                 gh-context: ${{ toJson(github) }}
 
             - name: Update Zephyr to specific revision (for developers purpose)
-              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 16b157bc4caf9a268caf11481624885f5046263f"
+              run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 7f064a1b02686f050b47e194fde4fc0514507cf6"
 
             - name: Build tools required for Factory Data
               # Run test for master and all PRs
@@ -71,14 +71,14 @@ jobs:
             - name: clean out build output (keep tools)
               run: rm -rf ./out/telink*
 
-            - name: Build example Telink (tl321x) Lighting App with OTA (LZMA), Shell, Factory Data
+            - name: Build example Telink (tl321x) Lighting App with OTA (LZMA), Factory Data
               # Run test for master and all PRs
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tl3218x-light-ota-compress-lzma-shell-factory-data' build"
+                    "./scripts/build/build_examples.py --target 'telink-tl3218x-light-ota-compress-lzma-factory-data' build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tl3218x light-app-ota-compress-lzma-shell-factory-data \
-                    out/telink-tl3218x-light-ota-compress-lzma-shell-factory-data/zephyr/zephyr.elf \
+                    telink tl3218x light-app-ota-compress-lzma-factory-data \
+                    out/telink-tl3218x-light-ota-compress-lzma-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
             - name: clean out build output (keep tools)
diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp
@@ -29,7 +29,6 @@
 #include <zephyr/kernel.h>
 
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/util/persistence/DeferredAttributePersistenceProvider.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
@@ -45,35 +44,6 @@ RgbColor_t sLedRgb;
 
 AppTask AppTask::sAppTask;
 
-/**
- * @brief Set deferred attributes storage
- *
- * @see Define a custom attribute persister which makes actual write of the CurrentHue, CurrentSaturation, CurrentLevel attributes
- * value to the non-volatile storage only when it has remained constant for 5 seconds. This is to reduce the flash wearout when the
- * attribute changes frequently as a result of MoveToLevel command. DeferredAttribute object describes a deferred attribute, but
- * also holds a buffer with a value to be written, so it must live so long as the DeferredAttributePersistenceProvider object.
- *
- * @param ATTRIBUTES_ARRAY_SIZE The lenght of the DeferredAttribute array
- * @param DEFERRED_STORAGE_TIME The deferred time(ms) to store attributes
- */
-#define ATTRIBUTES_ARRAY_SIZE (3U)
-#define DEFERRED_STORAGE_TIME (5000U)
-
-DeferredAttribute gPersisters[] = {
-#if CONFIG_DEFERRED_ATTR_STORAGE
-    DeferredAttribute(
-        ConcreteAttributePath(kExampleEndpointId, Clusters::ColorControl::Id, Clusters::ColorControl::Attributes::CurrentHue::Id)),
-    DeferredAttribute(ConcreteAttributePath(kExampleEndpointId, Clusters::ColorControl::Id,
-                                            Clusters::ColorControl::Attributes::CurrentSaturation::Id)),
-    DeferredAttribute(
-        ConcreteAttributePath(kExampleEndpointId, Clusters::LevelControl::Id, Clusters::LevelControl::Attributes::CurrentLevel::Id))
-#endif // CONFIG_DEFERRED_ATTR_STORAGE
-};
-
-DeferredAttributePersistenceProvider gDeferredAttributePersister(Server::GetInstance().GetDefaultAttributePersister(),
-                                                                 Span<DeferredAttribute>(gPersisters, ATTRIBUTES_ARRAY_SIZE),
-                                                                 System::Clock::Milliseconds32(DEFERRED_STORAGE_TIME));
-
 bool AppTask::IsTurnedOn() const
 {
     return sfixture_on;
@@ -297,9 +267,6 @@ CHIP_ERROR AppTask::Init(void)
     SetExampleButtonCallbacks(LightingActionEventHandler);
     InitCommonParts();
 
-    /* add deferred storage attribute for provider */
-    app::SetAttributePersistenceProvider(&gDeferredAttributePersister);
-
 #if CONFIG_CUSTOMER_MODE
     if (user_para.val == USER_ZB_SW_VAL)
     {
diff --git a/examples/platform/telink/common/src/AppTaskCommon.cpp b/examples/platform/telink/common/src/AppTaskCommon.cpp
@@ -40,6 +40,8 @@
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/endpoint-config-api.h>
+#include <app/util/persistence/DefaultAttributePersistenceProvider.h>
+#include <app/util/persistence/DeferredAttributePersistenceProvider.h>
 #include <data-model-providers/codegen/Instance.h>
 #include <setup_payload/OnboardingCodesUtil.h>
 
@@ -120,6 +122,37 @@ Identify sIdentify = {
 
 #endif
 
+/**
+ * @brief Set deferred attributes storage
+ *
+ * @see Define a custom attribute persister which makes actual write of the CurrentHue, CurrentSaturation, CurrentLevel attributes
+ * value to the non-volatile storage only when it has remained constant for 5 seconds. This is to reduce the flash wearout when the
+ * attribute changes frequently as a result of MoveToLevel command. DeferredAttribute object describes a deferred attribute, but
+ * also holds a buffer with a value to be written, so it must live so long as the DeferredAttributePersistenceProvider object.
+ *
+ * @param ATTRIBUTES_ARRAY_SIZE The lenght of the DeferredAttribute array
+ * @param DEFERRED_STORAGE_TIME The deferred time(ms) to store attributes
+ */
+#define ATTRIBUTES_ARRAY_SIZE (3U)
+#define DEFERRED_STORAGE_TIME (5000U)
+
+DeferredAttribute gPersisters[] = {
+#if CONFIG_DEFERRED_ATTR_STORAGE
+    DeferredAttribute(
+        ConcreteAttributePath(kExampleEndpointId, Clusters::ColorControl::Id, Clusters::ColorControl::Attributes::CurrentHue::Id)),
+    DeferredAttribute(ConcreteAttributePath(kExampleEndpointId, Clusters::ColorControl::Id,
+                                            Clusters::ColorControl::Attributes::CurrentSaturation::Id)),
+    DeferredAttribute(
+        ConcreteAttributePath(kExampleEndpointId, Clusters::LevelControl::Id, Clusters::LevelControl::Attributes::CurrentLevel::Id))
+#endif // CONFIG_DEFERRED_ATTR_STORAGE
+};
+
+// Deferred persistence will be auto-initialized as soon as the default persistence is initialized
+DefaultAttributePersistenceProvider gSimpleAttributePersistence;
+DeferredAttributePersistenceProvider gDeferredAttributePersister(gSimpleAttributePersistence,
+                                                                 Span<DeferredAttribute>(gPersisters, ATTRIBUTES_ARRAY_SIZE),
+                                                                 System::Clock::Milliseconds32(DEFERRED_STORAGE_TIME));
+
 // NOTE! This key is for test/certification only and should not be available in production devices!
 uint8_t sTestEventTriggerEnableKey[TestEventTriggerDelegate::kEnableKeyLength] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
                                                                                    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
@@ -590,6 +623,8 @@ CHIP_ERROR AppTaskCommon::InitCommonParts(void)
     VerifyOrDie(sTestEventTriggerDelegate.AddHandler(&sOtaTestEventTriggerHandler) == CHIP_NO_ERROR);
 #endif
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    VerifyOrDie(gSimpleAttributePersistence.Init(initParams.persistentStorageDelegate) == CHIP_NO_ERROR);
+
     initParams.dataModelProvider        = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     initParams.appDelegate              = &sCallbacks;
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
@@ -600,6 +635,9 @@ CHIP_ERROR AppTaskCommon::InitCommonParts(void)
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 #endif
 
+    /* add deferred storage attribute for provider */
+    app::SetAttributePersistenceProvider(&gDeferredAttributePersister);
+
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 
