Skip to content

Commit 1701841

Browse files
wy-hhpull[bot]
authored andcommitted
[Bouffalolab] Add data model/zap for Wi-Fi and Thread separately in lighting-app (#25839)
* update lighting app data model * correct feature value of network commissioning for wifi * fix restyle * update matter files
1 parent f606158 commit 1701841

File tree

7 files changed

+20768
-4
lines changed

7 files changed

+20768
-4
lines changed

examples/lighting-app/bouffalolab/bl602/BUILD.gn

+10-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import("${build_root}/config/defaults.gni")
2222
import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
2323
import("${chip_root}/src/platform/device.gni")
2424

25+
import("${chip_root}/src/app/chip_data_model.gni")
26+
2527
if (chip_enable_pw_rpc) {
2628
import("//build_overrides/pigweed.gni")
2729
import("$dir_pw_build/target_types.gni")
@@ -78,6 +80,13 @@ bl_iot_sdk("sdk") {
7880
}
7981
}
8082

83+
chip_data_model("bouffalolab-lighting") {
84+
zap_file = "${example_dir}/../data_model/lighting-app-wifi.zap"
85+
86+
zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
87+
is_server = true
88+
}
89+
8190
bouffalolab_executable("lighting_app") {
8291
output_name = "chip-bl602-lighting-example.out"
8392

@@ -116,9 +125,9 @@ bouffalolab_executable("lighting_app") {
116125
]
117126

118127
deps = [
128+
":bouffalolab-lighting",
119129
":sdk",
120130
"${chip_root}/examples/common/QRCode",
121-
"${chip_root}/examples/lighting-app/lighting-common",
122131
"${chip_root}/examples/providers:device_info_provider",
123132
"${chip_root}/src/lib",
124133
"${chip_root}/src/setup_payload",

examples/lighting-app/bouffalolab/bl702/BUILD.gn

+10-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import("${build_root}/config/defaults.gni")
2222
import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
2323
import("${chip_root}/src/platform/device.gni")
2424

25+
import("${chip_root}/src/app/chip_data_model.gni")
26+
2527
if (chip_enable_pw_rpc) {
2628
import("//build_overrides/pigweed.gni")
2729
import("$dir_pw_build/target_types.gni")
@@ -93,6 +95,13 @@ bl_iot_sdk("sdk") {
9395
}
9496
}
9597

98+
chip_data_model("bouffalolab-lighting") {
99+
zap_file = "${example_dir}/../data_model/lighting-app-thread.zap"
100+
101+
zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
102+
is_server = true
103+
}
104+
96105
bouffalolab_executable("lighting_app") {
97106
output_name = "chip-bl702-lighting-example.out"
98107
bl_plat_name = "bl702"
@@ -135,8 +144,8 @@ bouffalolab_executable("lighting_app") {
135144
]
136145

137146
deps = [
147+
":bouffalolab-lighting",
138148
":sdk",
139-
"${chip_root}/examples/lighting-app/lighting-common",
140149
"${chip_root}/examples/providers:device_info_provider",
141150
"${chip_root}/src/lib",
142151
"${chip_root}/src/setup_payload",

examples/lighting-app/bouffalolab/common/AppTask.h

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include <stdbool.h>
2222
#include <stdint.h>
2323

24-
// #include "AppEvent.h"
25-
2624
#include "FreeRTOS.h"
2725
#include "timers.h"
2826
#include <platform/CHIPDeviceLayer.h>

0 commit comments

Comments
 (0)