[BEKEN] add beken examples/platform files (project-chip#22405)

* [BEKEN] add beken examples/platform files * add beken examples/platform files * modify beken examples/lighting-app files * [BEKEN] optimize by reviewer's suggestion * remove commented-out code * modify class members attr
isiu-apple · Sep 16, 2022 · e12b5f0 · e12b5f0
1 parent 457d260
commit e12b5f0
Show file tree

Hide file tree

Showing 16 changed files with 556 additions and 436 deletions.
diff --git a/examples/lighting-app/beken/BUILD.gn b/examples/lighting-app/beken/BUILD.gn
@@ -15,14 +15,19 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
+examples_plat_dir = "${chip_root}/examples/platform/beken"
+
 static_library("MatterApp") {
   public_deps = [
     "${chip_root}/examples/lighting-app/lighting-common",
     "${chip_root}/src/lib",
   ]
 
   sources = [
-    "main/CHIPDeviceManager.cpp",
+    "${examples_plat_dir}/common/BekenAppServer.cpp",
+    "${examples_plat_dir}/common/CHIPDeviceManager.cpp",
+    "${examples_plat_dir}/common/CommonDeviceCallbacks.cpp",
+    "${examples_plat_dir}/ota/OTAHelper.cpp",
     "main/DeviceCallbacks.cpp",
     "main/DsoHack.cpp",
     "main/chipinterface.cpp",

diff --git a/examples/lighting-app/beken/main/CHIPDeviceManager.cpp b/examples/lighting-app/beken/main/CHIPDeviceManager.cpp
diff --git a/examples/lighting-app/beken/main/DeviceCallbacks.cpp b/examples/lighting-app/beken/main/DeviceCallbacks.cpp
@@ -22,9 +22,11 @@
  * Implements all the callbacks to the application from the CHIP Stack
  *
  **/
+
 #include "DeviceCallbacks.h"
 
-#include "CHIPDeviceManager.h"
+#include <common/CHIPDeviceManager.h>
+
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/cluster-id.h>
 #include <app/CommandHandler.h>
@@ -49,75 +51,8 @@ using namespace ::chip::Logging;
 uint32_t identifyTimerCount;
 constexpr uint32_t kIdentifyTimerDelayMS = 250;
 
-void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
-{
-    ChipLogProgress(Zcl, "DeviceEventCallback, event->Type:%d \r\n", event->Type);
-    switch (event->Type)
-    {
-    case DeviceEventType::kInternetConnectivityChange:
-        OnInternetConnectivityChange(event);
-        break;
-
-    // case DeviceEventType::kSessionEstablished:
-    //   OnSessionEstablished(event);
-    //    break;
-    case DeviceEventType::kInterfaceIpAddressChanged:
-        ChipLogProgress(Zcl, "IP(%s) changed event",
-                        (event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV4_Assigned) ? "IPv4" : "IPv6");
-        if ((event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV4_Assigned) ||
-            (event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV6_Assigned))
-        {
-            // MDNS server restart on any ip assignment: if link local ipv6 is configured, that
-            // will not trigger a 'internet connectivity change' as there is no internet
-            // connectivity. MDNS still wants to refresh its listening interfaces to include the
-            // newly selected address.
-            chip::app::DnssdServer::Instance().StartServer();
-        }
-        break;
-    case DeviceEventType::kCHIPoBLEConnectionEstablished:
-        ChipLogProgress(Zcl, "CHIPoBLE connection established");
-        break;
-    case DeviceEventType::kCHIPoBLEConnectionClosed:
-        ChipLogProgress(Zcl, "CHIPoBLE disconnected");
-        break;
-    case DeviceEventType::kCommissioningComplete:
-        ChipLogProgress(Zcl, "Commissioning complete");
-        break;
-    }
-}
-
-void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
-{
-    if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
-    {
-        ChipLogProgress(Zcl, "Server ready at:%d", CHIP_PORT);
-        // chip::app::DnssdServer::Instance().StartServer();
-    }
-    else if (event->InternetConnectivityChange.IPv4 == kConnectivity_Lost)
-    {
-        ChipLogProgress(Zcl, "Lost IPv4 connectivity...");
-    }
-    if (event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
-    {
-        ChipLogProgress(Zcl, "IPv6 Server ready...");
-        chip::app::DnssdServer::Instance().StartServer();
-    }
-    else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
-    {
-        ChipLogProgress(Zcl, "Lost IPv6 connectivity...");
-    }
-}
-
-void DeviceCallbacks::OnSessionEstablished(const ChipDeviceEvent * event)
-{
-    if (event->SessionEstablished.IsCommissioner)
-    {
-        ChipLogProgress(Zcl, "Commissioner detected!");
-    }
-}
-
-void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                                  uint8_t type, uint16_t size, uint8_t * value)
+void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId,
+                                                     uint8_t type, uint16_t size, uint8_t * value)
 {
     switch (clusterId)
     {
@@ -135,7 +70,7 @@ void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, Cluster
     }
 }
 
-void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+void AppDeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID,
                  ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId));
@@ -161,7 +96,7 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState)
     }
 }
 
-void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+void AppDeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
 {
     VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID,
                  ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId));
@@ -178,9 +113,3 @@ void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointI
 exit:
     return;
 }
-
-bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::CommandHandler * commandObj)
-{
-    emberAfSendDefaultResponse(emberAfCurrentCommand(), EMBER_ZCL_STATUS_SUCCESS);
-    return true;
-}