[Bouffalolab] Add data model/zap for Wi-Fi and Thread separately in l…

…ighting-app (#25839) * update lighting app data model * correct feature value of network commissioning for wifi * fix restyle * update matter files
project-chip · Nov 27, 2023 · 5537951 · 5537951
1 parent 98c3736
commit 5537951
Show file tree

Hide file tree

Showing 7 changed files with 20,768 additions and 4 deletions.
diff --git a/examples/lighting-app/bouffalolab/bl602/BUILD.gn b/examples/lighting-app/bouffalolab/bl602/BUILD.gn
@@ -22,6 +22,8 @@ import("${build_root}/config/defaults.gni")
 import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 import("${chip_root}/src/platform/device.gni")
 
+import("${chip_root}/src/app/chip_data_model.gni")
+
 if (chip_enable_pw_rpc) {
   import("//build_overrides/pigweed.gni")
   import("$dir_pw_build/target_types.gni")
@@ -78,6 +80,13 @@ bl_iot_sdk("sdk") {
   }
 }
 
+chip_data_model("bouffalolab-lighting") {
+  zap_file = "${example_dir}/../data_model/lighting-app-wifi.zap"
+
+  zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
+  is_server = true
+}
+
 bouffalolab_executable("lighting_app") {
   output_name = "chip-bl602-lighting-example.out"
 
@@ -116,9 +125,9 @@ bouffalolab_executable("lighting_app") {
   ]
 
   deps = [
+    ":bouffalolab-lighting",
     ":sdk",
     "${chip_root}/examples/common/QRCode",
-    "${chip_root}/examples/lighting-app/lighting-common",
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
     "${chip_root}/src/setup_payload",

diff --git a/examples/lighting-app/bouffalolab/bl702/BUILD.gn b/examples/lighting-app/bouffalolab/bl702/BUILD.gn
@@ -22,6 +22,8 @@ import("${build_root}/config/defaults.gni")
 import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 import("${chip_root}/src/platform/device.gni")
 
+import("${chip_root}/src/app/chip_data_model.gni")
+
 if (chip_enable_pw_rpc) {
   import("//build_overrides/pigweed.gni")
   import("$dir_pw_build/target_types.gni")
@@ -93,6 +95,13 @@ bl_iot_sdk("sdk") {
   }
 }
 
+chip_data_model("bouffalolab-lighting") {
+  zap_file = "${example_dir}/../data_model/lighting-app-thread.zap"
+
+  zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
+  is_server = true
+}
+
 bouffalolab_executable("lighting_app") {
   output_name = "chip-bl702-lighting-example.out"
   bl_plat_name = "bl702"
@@ -135,8 +144,8 @@ bouffalolab_executable("lighting_app") {
   ]
 
   deps = [
+    ":bouffalolab-lighting",
     ":sdk",
-    "${chip_root}/examples/lighting-app/lighting-common",
     "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
     "${chip_root}/src/setup_payload",

diff --git a/examples/lighting-app/bouffalolab/common/AppTask.h b/examples/lighting-app/bouffalolab/common/AppTask.h
@@ -21,8 +21,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-// #include "AppEvent.h"
-
 #include "FreeRTOS.h"
 #include "timers.h"
 #include <platform/CHIPDeviceLayer.h>