[Telink] Update ota-requestor-app example after add common apps files

examples/all-clusters-app/telink/include/AppConfig.h

@@ -19,9 +19,10 @@
 #pragma once
 
 // ---- All Clusters Application example config ----
-#define APP_USE_EXAMPLE_START_BUTTON    0
-#define APP_USE_THREAD_START_BUTTON     1
-#define APP_SET_DEVICE_INFO_PROVIDER    1
-#define APP_USE_IDENTIFY_PWM            1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
+#define APP_USE_EXAMPLE_START_BUTTON        0
+#define APP_USE_THREAD_START_BUTTON         1
+#define APP_SET_DEVICE_INFO_PROVIDER        1
+#define APP_SET_NETWORK_COMM_ENDPOINT_SEC   1
+#define APP_USE_IDENTIFY_PWM                1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
 
 #include "AppConfigCommon.h"

examples/all-clusters-app/telink/src/AppTask.cpp

@@ -20,32 +20,17 @@
 
 #include "binding-handler.h"
 
-#include <app/server/OnboardingCodesUtil.h>
-#include <app/server/Server.h>
-#include <app/util/attribute-storage.h>
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-
 #include <zephyr/logging/log.h>
 #include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
-namespace {
-constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
-} // namespace
-
 AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init(void)
 {
     InitCommonParts();
 
-    // We only have network commissioning on endpoint 0.
-    // Set up a valid Network Commissioning cluster on endpoint 0 is done in
-    // src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
-    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
-
     // Configure Bindings
     CHIP_ERROR err = InitBindingHandlers();
     if (err != CHIP_NO_ERROR)

examples/all-clusters-minimal-app/telink/include/AppConfig.h

@@ -20,9 +20,10 @@
 
 // ---- All Clusters Minimal Application example config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON    0
-#define APP_USE_THREAD_START_BUTTON     0
-#define APP_SET_DEVICE_INFO_PROVIDER    0
-#define APP_USE_IDENTIFY_PWM            0 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
+#define APP_USE_EXAMPLE_START_BUTTON        0
+#define APP_USE_THREAD_START_BUTTON         0
+#define APP_SET_DEVICE_INFO_PROVIDER        0
+#define APP_SET_NETWORK_COMM_ENDPOINT_SEC   1
+#define APP_USE_IDENTIFY_PWM                0 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
 
 #include "AppConfigCommon.h"

examples/all-clusters-minimal-app/telink/src/AppTask.cpp

@@ -19,28 +19,17 @@
 #include "AppTask.h"
 #include "binding-handler.h"
 
-#include <app/util/attribute-storage.h>
-
 #include <zephyr/logging/log.h>
 #include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
-namespace {
-constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
-} // namespace
-
 AppTask AppTask::sAppTask;
 
 CHIP_ERROR AppTask::Init()
 { 
     InitCommonParts();
 
-    // We only have network commissioning on endpoint 0.
-    // Set up a valid Network Commissioning cluster on endpoint 0 is done in
-    // src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
-    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
-
     // Configure Bindings
     CHIP_ERROR err = InitBindingHandlers();
     if (err != CHIP_NO_ERROR)

examples/contact-sensor-app/telink/include/AppConfig.h

@@ -19,10 +19,11 @@
 #pragma once
 
 // ---- All Clusters Application example config ----
-#define APP_USE_EXAMPLE_START_BUTTON    1
-#define APP_USE_THREAD_START_BUTTON     0
-#define APP_SET_DEVICE_INFO_PROVIDER    1
-#define APP_USE_IDENTIFY_PWM            1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
+#define APP_USE_EXAMPLE_START_BUTTON        1
+#define APP_USE_THREAD_START_BUTTON         0
+#define APP_SET_DEVICE_INFO_PROVIDER        1
+#define APP_SET_NETWORK_COMM_ENDPOINT_SEC   0
+#define APP_USE_IDENTIFY_PWM                1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
 
 #include "AppConfigCommon.h"
 

examples/light-switch-app/telink/include/AppConfig.h

@@ -20,9 +20,10 @@
 
 // ---- Light Switch Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON    1
-#define APP_USE_THREAD_START_BUTTON     1
-#define APP_SET_DEVICE_INFO_PROVIDER    1
-#define APP_USE_IDENTIFY_PWM            1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
+#define APP_USE_EXAMPLE_START_BUTTON        1
+#define APP_USE_THREAD_START_BUTTON         1
+#define APP_SET_DEVICE_INFO_PROVIDER        1
+#define APP_SET_NETWORK_COMM_ENDPOINT_SEC   0
+#define APP_USE_IDENTIFY_PWM                1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
 
 #include "AppConfigCommon.h"

examples/lighting-app/telink/include/AppConfig.h

@@ -20,10 +20,11 @@
 
 // ---- Lighting Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON    1
-#define APP_USE_THREAD_START_BUTTON     1
-#define APP_SET_DEVICE_INFO_PROVIDER    1
-#define APP_USE_IDENTIFY_PWM            1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
+#define APP_USE_EXAMPLE_START_BUTTON        1
+#define APP_USE_THREAD_START_BUTTON         1
+#define APP_SET_DEVICE_INFO_PROVIDER        1
+#define APP_SET_NETWORK_COMM_ENDPOINT_SEC   0
+#define APP_USE_IDENTIFY_PWM                1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
 
 #include "AppConfigCommon.h"
 

examples/lock-app/telink/include/AppConfig.h

@@ -20,10 +20,11 @@
 
 // ---- Lock Example App Config ----
 
-#define APP_USE_EXAMPLE_START_BUTTON    1
-#define APP_USE_THREAD_START_BUTTON     1
-#define APP_SET_DEVICE_INFO_PROVIDER    1
-#define APP_USE_IDENTIFY_PWM            1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
+#define APP_USE_EXAMPLE_START_BUTTON        1
+#define APP_USE_THREAD_START_BUTTON         1
+#define APP_SET_DEVICE_INFO_PROVIDER        1
+#define APP_SET_NETWORK_COMM_ENDPOINT_SEC   0
+#define APP_USE_IDENTIFY_PWM                1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
 
 #include "AppConfigCommon.h"
 

examples/ota-requestor-app/telink/CMakeLists.txt

@@ -59,6 +59,7 @@ target_include_directories(app PRIVATE
                            include
                            ${GEN_DIR}/app-common
                            ${GEN_DIR}/ota-requestor-app
+                           ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
                            ${TELINK_COMMON}/app/include)
 
@@ -68,8 +69,9 @@ add_definitions(
 
 target_sources(app PRIVATE
                src/AppTask.cpp
-               src/main.cpp
                src/ZclCallbacks.cpp
+               ${TELINK_COMMON}/common/src/mainCommon.cpp
+               ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp

examples/ota-requestor-app/telink/include/AppConfig.h

@@ -20,15 +20,10 @@
 
 // ---- OTA Requestor Example App Config ----
 
-// Buttons config
-#define BUTTON_PORT DEVICE_DT_GET(DT_NODELABEL(gpioc))
+#define APP_USE_EXAMPLE_START_BUTTON        0
+#define APP_USE_THREAD_START_BUTTON         1
+#define APP_SET_DEVICE_INFO_PROVIDER        1
+#define APP_SET_NETWORK_COMM_ENDPOINT_SEC   1
+#define APP_USE_IDENTIFY_PWM                1 // APP_USE_IDENTIFY_PWM must be defined before including "AppConfigCommon.h"
 
-#define BUTTON_PIN_1 2
-#define BUTTON_PIN_3 3
-#define BUTTON_PIN_4 1
-#define BUTTON_PIN_2 0
-
-// LEDs config
-#define LEDS_PORT DEVICE_DT_GET(DT_NODELABEL(gpiob))
-#define SYSTEM_STATE_LED 7
-#define LIGHTING_PWM_SPEC_IDENTIFY_GREEN PWM_DT_SPEC_GET(DT_ALIAS(pwm_led3))
+#include "AppConfigCommon.h"

examples/ota-requestor-app/telink/include/AppTask.h

@@ -18,74 +18,17 @@
 
 #pragma once
 
-#include "AppEvent.h"
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-#include "LEDWidget.h"
-#endif
-#include "PWMDevice.h"
+#include "AppTaskCommon.h"
 
-#include <zephyr/drivers/gpio.h>
-
-#include <platform/CHIPDeviceLayer.h>
-
-#include <cstdint>
-
-struct k_timer;
-struct Identify;
-
-class AppTask
+class AppTask : public AppTaskCommon
 {
-public:
-    CHIP_ERROR StartApp(void);
-
-    enum Action_t : uint8_t
-    {
-        ON_ACTION = 0,
-        OFF_ACTION,
-        LEVEL_ACTION,
-
-        INVALID_ACTION
-    };
-
-    void PostLightingActionRequest(Action_t aAction);
-    void PostEvent(AppEvent * event);
-    static void IdentifyEffectHandler(EmberAfIdentifyEffectIdentifier aEffect);
-
 private:
     friend AppTask & GetAppTask(void);
-    CHIP_ERROR Init(void);
-
-    static void ActionInitiated(AppTask::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(AppTask::Action_t aAction, int32_t aActor);
-    static void ActionIdentifyStateUpdateHandler(k_timer * timer);
-
-    void DispatchEvent(AppEvent * event);
-
-#if CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED
-    static void UpdateLedStateEventHandler(AppEvent * aEvent);
-    static void LEDStateUpdateHandler(LEDWidget * ledWidget);
-    static void UpdateStatusLED();
-#endif
-    static void FactoryResetButtonEventHandler(void);
-    static void StartThreadButtonEventHandler(void);
-    static void StartBleAdvButtonEventHandler(void);
-
-    static void ChipEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
-
-    static void FactoryResetTimerTimeoutCallback(k_timer * timer);
-
-    static void FactoryResetTimerEventHandler(AppEvent * aEvent);
-    static void FactoryResetHandler(AppEvent * aEvent);
-    static void StartThreadHandler(AppEvent * aEvent);
-    static void StartBleAdvHandler(AppEvent * aEvent);
-    static void UpdateIdentifyStateEventHandler(AppEvent * aEvent);
-
-    static void InitButtons(void);
+    friend class AppTaskCommon;
 
-    static void ThreadProvisioningHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+    CHIP_ERROR Init();
 
     static AppTask sAppTask;
-    PWMDevice mPwmIdentifyLed;
 };
 
 inline AppTask & GetAppTask(void)

examples/ota-requestor-app/telink/prj.conf

@@ -54,6 +54,12 @@ CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING="2022"
 # Enable CHIP pairing automatically on application start.
 CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
 
+# Disable factory data support. 
+CONFIG_CHIP_FACTORY_DATA=n
+CONFIG_CHIP_FACTORY_DATA_BUILD=n
+CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
+CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
+
 # CHIP shell
 CONFIG_CHIP_LIB_SHELL=n