Skip to content

Commit 3515c62

Browse files
sabollim-silabsarun-silabs
authored andcommitted
[Closure] Separating Zap files for Wifi and thread closure apps (#41652)
* Seperating zap file for wifi and thread * PR comments'
1 parent aaa344e commit 3515c62

File tree

9 files changed

+14387
-18
lines changed

9 files changed

+14387
-18
lines changed

examples/closure-app/closure-common/closure-app.matter

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2089,7 +2089,7 @@ provisional cluster ClosureDimension = 261 {
20892089
}
20902090

20912091
endpoint 0 {
2092-
device type ma_rootdevice = 22, version 3;
2092+
device type ma_rootdevice = 22, version 4;
20932093

20942094
binding cluster OtaSoftwareUpdateProvider;
20952095

examples/closure-app/closure-common/closure-app.zap

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
}
5555
],
5656
"deviceVersions": [
57-
3
57+
4
5858
],
5959
"deviceIdentifiers": [
6060
22
@@ -2800,10 +2800,10 @@
28002800
"side": "server",
28012801
"type": "int16u",
28022802
"included": 1,
2803-
"storageOption": "RAM",
2803+
"storageOption": "External",
28042804
"singleton": 0,
28052805
"bounded": 0,
2806-
"defaultValue": "3",
2806+
"defaultValue": null,
28072807
"reportable": 1,
28082808
"minInterval": 0,
28092809
"maxInterval": 65344,
@@ -3717,10 +3717,10 @@
37173717
"side": "server",
37183718
"type": "bitmap32",
37193719
"included": 1,
3720-
"storageOption": "RAM",
3720+
"storageOption": "External",
37213721
"singleton": 0,
37223722
"bounded": 0,
3723-
"defaultValue": "0",
3723+
"defaultValue": null,
37243724
"reportable": 1,
37253725
"minInterval": 1,
37263726
"maxInterval": 65534,
@@ -3733,10 +3733,10 @@
37333733
"side": "server",
37343734
"type": "int16u",
37353735
"included": 1,
3736-
"storageOption": "RAM",
3736+
"storageOption": "External",
37373737
"singleton": 0,
37383738
"bounded": 0,
3739-
"defaultValue": "1",
3739+
"defaultValue": null,
37403740
"reportable": 1,
37413741
"minInterval": 0,
37423742
"maxInterval": 65344,
@@ -4200,10 +4200,10 @@
42004200
"side": "server",
42014201
"type": "int16u",
42024202
"included": 1,
4203-
"storageOption": "RAM",
4203+
"storageOption": "External",
42044204
"singleton": 0,
42054205
"bounded": 0,
4206-
"defaultValue": "0x0",
4206+
"defaultValue": null,
42074207
"reportable": 1,
42084208
"minInterval": 1,
42094209
"maxInterval": 65534,
@@ -4216,10 +4216,10 @@
42164216
"side": "server",
42174217
"type": "IdentifyTypeEnum",
42184218
"included": 1,
4219-
"storageOption": "RAM",
4219+
"storageOption": "External",
42204220
"singleton": 0,
42214221
"bounded": 0,
4222-
"defaultValue": "0x00",
4222+
"defaultValue": null,
42234223
"reportable": 1,
42244224
"minInterval": 1,
42254225
"maxInterval": 65534,
@@ -4280,10 +4280,10 @@
42804280
"side": "server",
42814281
"type": "bitmap32",
42824282
"included": 1,
4283-
"storageOption": "RAM",
4283+
"storageOption": "External",
42844284
"singleton": 0,
42854285
"bounded": 0,
4286-
"defaultValue": "0",
4286+
"defaultValue": null,
42874287
"reportable": 1,
42884288
"minInterval": 1,
42894289
"maxInterval": 65534,
@@ -4296,10 +4296,10 @@
42964296
"side": "server",
42974297
"type": "int16u",
42984298
"included": 1,
4299-
"storageOption": "RAM",
4299+
"storageOption": "External",
43004300
"singleton": 0,
43014301
"bounded": 0,
4302-
"defaultValue": "0x0006",
4302+
"defaultValue": null,
43034303
"reportable": 1,
43044304
"minInterval": 1,
43054305
"maxInterval": 65534,

examples/closure-app/silabs/build_for_wifi_args.gni

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ import("${chip_root}/src/platform/silabs/wifi/args.gni")
1919

2020
sl_enable_test_event_trigger = true
2121
chip_enable_ota_requestor = false
22-
app_data_model = "${chip_root}/examples/closure-app/closure-common"
22+
app_data_model =
23+
"${chip_root}/examples/closure-app/silabs/data_model:silabs-closure"
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Copyright (c) 2020 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import("//build_overrides/chip.gni")
16+
import("${chip_root}/src/app/chip_data_model.gni")
17+
import("${chip_root}/src/platform/device.gni")
18+
19+
chip_data_model("silabs-closure") {
20+
if (chip_enable_wifi) {
21+
zap_file = "closure-wifi-app.zap"
22+
} else {
23+
zap_file = "closure-thread-app.zap"
24+
}
25+
is_server = true
26+
}

0 commit comments

Comments
 (0)