Skip to content

Commit d5d774c

Browse files
restyled-commitsmarius-alex-tache
restyled-commits
authored and
marius-alex-tache
committed
Restyled by gn
1 parent 00dabbf commit d5d774c

File tree

7 files changed

+66
-84
lines changed

7 files changed

+66
-84
lines changed

‎examples/contact-sensor-app/nxp/k32w1/BUILD.gn

+17-21
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ k32w1_sdk("sdk") {
5656

5757
include_dirs += [
5858
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
59-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480"
59+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480",
6060
]
6161

6262
sources += [
6363
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480/clock_config.c",
6464
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480/pin_mux.c",
65+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/app_services_init.c",
66+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board.c",
6567
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_comp.c",
68+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_dcdc.c",
69+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
6670
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
67-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board.c",
6871
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
69-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/app_services_init.c",
70-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_dcdc.c",
71-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c"
7272
]
7373

7474
if (is_debug) {
@@ -81,12 +81,11 @@ k32w1_sdk("sdk") {
8181
"CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
8282
]
8383

84-
if (chip_key_storage == "littlefs")
85-
{
84+
if (chip_key_storage == "littlefs") {
8685
include_dirs += [ "${example_platform_dir}/board" ]
8786
sources += [
8887
"${example_platform_dir}/board/peripherals.c",
89-
"${example_platform_dir}/board/peripherals.h"
88+
"${example_platform_dir}/board/peripherals.h",
9089
]
9190
}
9291
}
@@ -105,7 +104,7 @@ k32w1_executable("contact_sensor_app") {
105104
"CONFIG_NETWORK_LAYER_BLE=1",
106105
"CONFIG_THREAD_DEVICE_TYPE=kThreadDeviceType_SleepyEndDevice",
107106
"CONFIG_OPERATIONAL_KEYSTORE=1",
108-
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\""
107+
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
109108
]
110109

111110
if (chip_with_diag_logs_demo) {
@@ -117,7 +116,7 @@ k32w1_executable("contact_sensor_app") {
117116
} else {
118117
defines += [
119118
"CONFIG_ENABLE_FEEDBACK=1",
120-
"APP_QUEUE_TICKS_TO_WAIT=pdMS_TO_TICKS(10)"
119+
"APP_QUEUE_TICKS_TO_WAIT=pdMS_TO_TICKS(10)",
121120
]
122121
}
123122

@@ -142,23 +141,22 @@ k32w1_executable("contact_sensor_app") {
142141
"${common_example_dir}/clusters/source/ZclCallbacks.cpp",
143142
"${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
144143
"${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
145-
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp"
144+
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
146145
]
147146

148147
if (chip_with_low_power == 1) {
149148
sources += [ "${common_example_dir}/low_power/source/LowPower.cpp" ]
150149
}
151150

152151
if (chip_with_factory_data == 1) {
153-
include_dirs += [
154-
"${chip_root}/src/platform/nxp/common/legacy"
155-
]
152+
include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
156153
deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
157154
}
158155

159156
if (chip_enable_ota_requestor) {
160157
defines += [
161158
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
159+
162160
# The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
163161
"LED_MANAGER_ENABLE_STATUS_LED=0",
164162
]
@@ -179,19 +177,17 @@ k32w1_executable("contact_sensor_app") {
179177
include_dirs += [
180178
"${example_platform_dir}/util",
181179
"${example_platform_dir}/app/support",
182-
"${example_platform_dir}/button"
180+
"${example_platform_dir}/button",
183181
]
184182

185183
sources += [
186184
"${example_platform_dir}/button/ButtonManager.cpp",
187185
"${example_platform_dir}/clusters/Identify.cpp",
188-
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp"
186+
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
189187
]
190188

191189
if (chip_enable_ota_requestor) {
192-
sources += [
193-
"${example_platform_dir}/ota/OtaUtils.cpp"
194-
]
190+
sources += [ "${example_platform_dir}/ota/OtaUtils.cpp" ]
195191
}
196192

197193
include_dirs += [
@@ -202,8 +198,8 @@ k32w1_executable("contact_sensor_app") {
202198
sources += [
203199
"../common/AppTask.cpp",
204200
"../common/DeviceCallbacks.cpp",
201+
"../common/ZclCallbacks.cpp",
205202
"../common/main.cpp",
206-
"../common/ZclCallbacks.cpp"
207203
]
208204

209205
if (chip_with_low_power == 0) {
@@ -215,7 +211,7 @@ k32w1_executable("contact_sensor_app") {
215211

216212
deps += [
217213
"${chip_root}/examples/providers:device_info_provider",
218-
"${chip_root}/src/platform/logging:default"
214+
"${chip_root}/src/platform/logging:default",
219215
]
220216

221217
#lit and sit are using different zap files

‎examples/lighting-app/nxp/k32w1/BUILD.gn

+20-27
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import("//build_overrides/chip.gni")
1616
import("//build_overrides/nxp_sdk.gni")
1717
import("//build_overrides/openthread.gni")
1818

19-
import("${nxp_sdk_build_root}/nxp_sdk.gni")
2019
import("${nxp_sdk_build_root}/${nxp_sdk_name}/nxp_executable.gni")
20+
import("${nxp_sdk_build_root}/nxp_sdk.gni")
2121

2222
import("${nxp_sdk_build_root}/${nxp_sdk_name}/${nxp_sdk_name}.gni")
2323

@@ -60,19 +60,19 @@ k32w1_sdk("sdk") {
6060

6161
include_dirs += [
6262
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1",
63-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480"
63+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480",
6464
]
6565

6666
sources += [
6767
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480/clock_config.c",
6868
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/K32W1480/pin_mux.c",
69+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/app_services_init.c",
70+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board.c",
6971
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_comp.c",
72+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_dcdc.c",
73+
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c",
7074
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_lp.c",
71-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board.c",
7275
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/hardware_init.c",
73-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/app_services_init.c",
74-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_dcdc.c",
75-
"${k32w1_sdk_root}/middleware/wireless/framework/boards/kw45_k32w1/board_extflash.c"
7676
]
7777

7878
if (is_debug) {
@@ -94,12 +94,11 @@ k32w1_sdk("sdk") {
9494
"CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
9595
]
9696

97-
if (chip_key_storage == "littlefs")
98-
{
97+
if (chip_key_storage == "littlefs") {
9998
include_dirs += [ "${example_platform_dir}/board" ]
10099
sources += [
101100
"${example_platform_dir}/board/peripherals.c",
102-
"${example_platform_dir}/board/peripherals.h"
101+
"${example_platform_dir}/board/peripherals.h",
103102
]
104103
}
105104
}
@@ -125,7 +124,7 @@ k32w1_executable("light_app") {
125124
"CONFIG_OPERATIONAL_KEYSTORE=1",
126125
"CONFIG_ENABLE_FEEDBACK=1",
127126
"APP_QUEUE_TICKS_TO_WAIT=pdMS_TO_TICKS(10)",
128-
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\""
127+
"EXTERNAL_FACTORY_DATA_PROVIDER_HEADER=\"platform/nxp/common/legacy/FactoryDataProvider.h\"",
129128
]
130129

131130
# App common files
@@ -148,15 +147,16 @@ k32w1_executable("light_app") {
148147
"${common_example_dir}/clusters/source/ZclCallbacks.cpp",
149148
"${common_example_dir}/device_callbacks/source/CommonDeviceCallbacks.cpp",
150149
"${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
151-
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp"
150+
"${example_platform_dir}/factory_data/source/AppFactoryDataExample.cpp",
152151
]
153152

154153
if (chip_enable_ota_requestor) {
155154
defines += [
156155
"CONFIG_CHIP_OTA_IMAGE_PROCESSOR_HEADER=\"platform/nxp/common/legacy/OTAImageProcessorImpl.h\"",
156+
157157
# The status LED and the external flash CS pin are wired together. The OTA image writing may fail if used together.
158158
"LED_MANAGER_ENABLE_STATUS_LED=0",
159-
]
159+
]
160160

161161
include_dirs += [ "${common_example_dir}/ota_requestor/include" ]
162162
sources += [ "${common_example_dir}/ota_requestor/source/OTARequestorInitiatorMultiImage.cpp" ]
@@ -167,31 +167,25 @@ k32w1_executable("light_app") {
167167
include_dirs += [
168168
"${example_platform_dir}/util",
169169
"${example_platform_dir}/app/support",
170-
"${example_platform_dir}/button"
170+
"${example_platform_dir}/button",
171171
]
172172

173173
sources += [
174174
"${example_platform_dir}/button/ButtonManager.cpp",
175175
"${example_platform_dir}/clusters/Identify.cpp",
176-
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp"
176+
"${example_platform_dir}/operational_keystore/OperationalKeystore.cpp",
177177
]
178178

179179
if (chip_enable_ota_requestor) {
180-
sources += [
181-
"${example_platform_dir}/ota/OtaUtils.cpp"
182-
]
180+
sources += [ "${example_platform_dir}/ota/OtaUtils.cpp" ]
183181
}
184182

185183
if (chip_enable_pw_rpc) {
186-
sources += [
187-
"${example_platform_dir}/rpc/AppRpc.cpp"
188-
]
184+
sources += [ "${example_platform_dir}/rpc/AppRpc.cpp" ]
189185
}
190186

191187
if (chip_with_factory_data == 1) {
192-
include_dirs += [
193-
"${chip_root}/src/platform/nxp/common/legacy"
194-
]
188+
include_dirs += [ "${chip_root}/src/platform/nxp/common/legacy" ]
195189
deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
196190
}
197191

@@ -209,15 +203,15 @@ k32w1_executable("light_app") {
209203

210204
deps += [
211205
"${chip_root}/examples/providers:device_info_provider",
212-
"${chip_root}/src/platform/logging:default"
206+
"${chip_root}/src/platform/logging:default",
213207
]
214208

215209
if (chip_config_dimmable_led) {
216210
defines += [ "LIGHTING_MANAGER_ENABLE_DIMMABLE_LED=1" ]
217211
sources += [
218-
"${example_platform_dir}/util/LightingManagerDimmable.cpp",
219-
"${example_platform_dir}/util/LedDimmer.cpp",
220212
"${common_example_dir}/led_widget/include/LedDimmer.h",
213+
"${example_platform_dir}/util/LedDimmer.cpp",
214+
"${example_platform_dir}/util/LightingManagerDimmable.cpp",
221215
]
222216
deps += [ "${chip_root}/examples/lighting-app/lighting-common/" ]
223217
} else {
@@ -228,7 +222,6 @@ k32w1_executable("light_app") {
228222
deps += [ "${chip_root}/examples/lighting-app/nxp/zap/" ]
229223
}
230224

231-
232225
if (chip_openthread_ftd) {
233226
deps += [
234227
"${openthread_root}:libopenthread-cli-ftd",

‎examples/platform/nxp/k32w1/app/support/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import("//build_overrides/chip.gni")
1616
import("//build_overrides/nxp_sdk.gni")
1717

18-
import("${nxp_sdk_matter_support_root}/gn_build/nxp_sdk.gni")
1918
import("${chip_root}/src/platform/nxp/${nxp_platform}/args.gni")
19+
import("${nxp_sdk_matter_support_root}/gn_build/nxp_sdk.gni")
2020

2121
config("support_config") {
2222
include_dirs = [ "${chip_root}" ]

‎src/platform/nxp/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ source_set("logging") {
3737
# NXP factory data provider. Each platform should define an "nxp_factory_data" source set.
3838
# Usage: deps += [ "${chip_root}/src/platform/nxp:nxp_factory_data" ]
3939
group("nxp_factory_data") {
40-
public_deps = [ "${chip_root}/src/platform/nxp/${nxp_platform}:nxp_factory_data" ]
40+
public_deps =
41+
[ "${chip_root}/src/platform/nxp/${nxp_platform}:nxp_factory_data" ]
4142
}
4243

4344
# The application can use this target to integrate the default, platform-specific

0 commit comments

Comments
 (0)