Skip to content

Commit 422e391

Browse files
wy-hhwy-hh
committed
change contact sensor zap to version 103
1 parent a3380db commit 422e391

File tree

4 files changed

+26
-55
lines changed

4 files changed

+26
-55
lines changed

‎.github/workflows/examples-bouffalolab.yaml

+13-38
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,15 @@ jobs:
5858
run: |
5959
./scripts/run_in_build_env.sh \
6060
"./scripts/build/build_examples.py \
61-
--target bouffalolab-bl602dk-light-easyflash \
62-
--target bouffalolab-bl602dk-light-mfd-littlefs \
63-
--target bouffalolab-bl602dk-light-rpc-115200-littlefs \
61+
--target bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc \
6462
build \
6563
--copy-artifacts-to out/artifacts \
6664
"
6765
- name: Prepare some bloat report from the previous builds
6866
run: |
6967
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
70-
bl602 bl602 lighting-app \
71-
out/artifacts/bouffalolab-bl602dk-light-easyflash/chip-bl602-lighting-example.out \
72-
/tmp/bloat_reports/
73-
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
74-
bl602 bl602+mfd lighting-app \
75-
out/artifacts/bouffalolab-bl602dk-light-mfd-littlefs/chip-bl602-lighting-example.out \
76-
/tmp/bloat_reports/
77-
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
78-
bl602 bl602+rpc lighting-app \
79-
out/artifacts/bouffalolab-bl602dk-light-rpc-115200-littlefs/chip-bl602-lighting-example.out \
68+
bl602 bl602+mfd+littlefs+rpc lighting-app \
69+
out/artifacts/bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc/chip-bl602-lighting-example.out \
8070
/tmp/bloat_reports/
8171
- name: Clean out build output
8272
run: rm -rf ./out
@@ -85,35 +75,25 @@ jobs:
8575
run: |
8676
./scripts/run_in_build_env.sh \
8777
"./scripts/build/build_examples.py \
88-
--target bouffalolab-bl706dk-light-easyflash \
89-
--target bouffalolab-bl706dk-light-mfd-littlefs \
90-
--target bouffalolab-bl706dk-light-ethernet-littlefs \
78+
--target bouffalolab-bl706dk-light-ethernet-easyflash \
9179
--target bouffalolab-bl706dk-light-wifi-littlefs \
92-
--target bouffalolab-bl706dk-light-rpc-115200-littlefs \
80+
--target bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc \
9381
build \
9482
--copy-artifacts-to out/artifacts \
9583
"
9684
- name: Prepare some bloat report from the previous builds
9785
run: |
9886
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
99-
bl702 bl702 lighting-app \
100-
out/artifacts/bouffalolab-bl706dk-light-easyflash/chip-bl702-lighting-example.out \
101-
/tmp/bloat_reports/
102-
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
103-
bl702 bl702+mfd lighting-app \
104-
out/artifacts/bouffalolab-bl706dk-light-mfd-littlefs/chip-bl702-lighting-example.out \
105-
/tmp/bloat_reports/
106-
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
107-
bl702 bl706-eth lighting-app \
108-
out/artifacts/bouffalolab-bl706dk-light-ethernet-littlefs/chip-bl702-lighting-example.out \
87+
bl702 bl702+eth lighting-app \
88+
out/artifacts/bouffalolab-bl706dk-light-ethernet-easyflash/chip-bl702-lighting-example.out \
10989
/tmp/bloat_reports/
11090
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
111-
bl702 bl706-wifi lighting-app \
91+
bl702 bl702+wifi lighting-app \
11292
out/artifacts/bouffalolab-bl706dk-light-wifi-littlefs/chip-bl702-lighting-example.out \
11393
/tmp/bloat_reports/
11494
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
115-
bl702 bl702+rpc lighting-app \
116-
out/artifacts/bouffalolab-bl706dk-light-rpc-115200-littlefs/chip-bl702-lighting-example.out \
95+
bl702 bl706+mfd+rpc+littlefs lighting-app \
96+
out/artifacts/bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc/chip-bl702-lighting-example.out \
11797
/tmp/bloat_reports/
11898
- name: Clean out build output
11999
run: rm -rf ./out
@@ -123,20 +103,15 @@ jobs:
123103
run: |
124104
./scripts/run_in_build_env.sh \
125105
"./scripts/build/build_examples.py \
126-
--target bouffalolab-bl704ldk-light-easyflash \
127-
--target bouffalolab-bl704ldk-light-mfd-littlefs \
106+
--target bouffalolab-bl704ldk-light-thread-littlefs-mfd \
128107
build \
129108
--copy-artifacts-to out/artifacts \
130109
"
131110
- name: Prepare some bloat report from the previous builds
132111
run: |
133112
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
134-
bl702l bl702l lighting-app \
135-
out/artifacts/bouffalolab-bl704ldk-light-easyflash/chip-bl702l-lighting-example.out \
136-
/tmp/bloat_reports/
137-
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
138-
bl702l bl702l+mfd lighting-app \
139-
out/artifacts/bouffalolab-bl704ldk-light-mfd-littlefs/chip-bl702l-lighting-example.out \
113+
bl702l bl702l+mfd+littlefs lighting-app \
114+
out/artifacts/bouffalolab-bl704ldk-light-thread-littlefs-mfd/chip-bl702l-lighting-example.out \
140115
/tmp/bloat_reports/
141116
- name: Clean out build output
142117
run: rm -rf ./out

‎examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.matter

+5-6
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,6 @@ cluster GeneralCommissioning = 48 {
833833
provisional readonly attribute access(read: administer) optional int16u TCMinRequiredVersion = 6;
834834
provisional readonly attribute access(read: administer) optional bitmap16 TCAcknowledgements = 7;
835835
provisional readonly attribute access(read: administer) optional boolean TCAcknowledgementsRequired = 8;
836-
provisional readonly attribute access(read: administer) optional int32u TCUpdateDeadline = 9;
837836
readonly attribute command_id generatedCommandList[] = 65528;
838837
readonly attribute command_id acceptedCommandList[] = 65529;
839838
readonly attribute event_id eventList[] = 65530;
@@ -1241,7 +1240,7 @@ cluster GeneralDiagnostics = 51 {
12411240
/** Take a snapshot of system time and epoch time. */
12421241
command TimeSnapshot(): TimeSnapshotResponse = 1;
12431242
/** Request a variable length payload response. */
1244-
command access(invoke: manage) PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
1243+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
12451244
}
12461245

12471246
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -1809,10 +1808,10 @@ cluster IcdManagement = 70 {
18091808
readonly attribute access(read: administer) optional MonitoringRegistrationStruct registeredClients[] = 3;
18101809
readonly attribute access(read: administer) optional int32u ICDCounter = 4;
18111810
readonly attribute optional int16u clientsSupportedPerFabric = 5;
1812-
readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
1813-
readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
1814-
readonly attribute optional OperatingModeEnum operatingMode = 8;
1815-
readonly attribute optional int32u maximumCheckInBackOff = 9;
1811+
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
1812+
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
1813+
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1814+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
18161815
readonly attribute command_id generatedCommandList[] = 65528;
18171816
readonly attribute command_id acceptedCommandList[] = 65529;
18181817
readonly attribute event_id eventList[] = 65530;

‎examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.zap

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 104,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -41,16 +41,14 @@
4141
"code": 22,
4242
"profileId": 259,
4343
"label": "MA-rootdevice",
44-
"name": "MA-rootdevice",
45-
"deviceTypeOrder": 0
44+
"name": "MA-rootdevice"
4645
},
4746
"deviceTypes": [
4847
{
4948
"code": 22,
5049
"profileId": 259,
5150
"label": "MA-rootdevice",
52-
"name": "MA-rootdevice",
53-
"deviceTypeOrder": 0
51+
"name": "MA-rootdevice"
5452
}
5553
],
5654
"deviceVersions": [
@@ -3973,16 +3971,14 @@
39733971
"code": 21,
39743972
"profileId": 259,
39753973
"label": "MA-contactsensor",
3976-
"name": "MA-contactsensor",
3977-
"deviceTypeOrder": 0
3974+
"name": "MA-contactsensor"
39783975
},
39793976
"deviceTypes": [
39803977
{
39813978
"code": 21,
39823979
"profileId": 259,
39833980
"label": "MA-contactsensor",
3984-
"name": "MA-contactsensor",
3985-
"deviceTypeOrder": 0
3981+
"name": "MA-contactsensor"
39863982
}
39873983
],
39883984
"deviceVersions": [
@@ -4515,4 +4511,4 @@
45154511
"parentEndpointIdentifier": null
45164512
}
45174513
]
4518-
}
4514+
}

‎scripts/setup/requirements.bouffalolab.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ ecdsa>=0.18.0
44
qrcode==7.4.2
55
bitarray==2.6.0
66
python_stdnum==1.18
7-
pycryptodome>=3.20.0
7+
pycryptodome>=3.20.0
8+
construct>=2.10.70

0 commit comments

Comments
 (0)