Skip to content

Commit 1f20db4

Browse files
hicklinhicklin
authored
Merge branch 'master' into remove_depricated_RVC_items
2 parents 9175e75 + f63b505 commit 1f20db4

File tree

350 files changed

+26291
-10536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+26291
-10536
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ jobs:
143143
src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml \
144144
src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml \
145145
src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml \
146+
src/app/zap-templates/zcl/data-model/chip/messages-cluster.xml \
146147
src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml \
147148
src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml \
148149
src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml \

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,7 @@ examples/thermostat/ameba/build
8080
# https://github.com/espressif/idf-component-manager#using-with-a-project
8181
examples/*/esp32/managed_components
8282
examples/*/esp32/dependencies.lock
83+
84+
# jupyter temporary files
85+
.ipynb_checkpoints
86+

‎docs/clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ Generally regenerate using one of:
7979
| 129 | 0x81 | ValveConfigurationAndControl |
8080
| 145 | 0x91 | ElectricalEnergyMeasurement |
8181
| 150 | 0x96 | DemandResponseLoadControl |
82+
| 151 | 0x97 | Messages |
8283
| 152 | 0x98 | DeviceEnergyManagement |
8384
| 153 | 0x99 | EnergyEvse |
8485
| 155 | 0x9B | EnergyPreference |

‎docs/guides/repl/.ipynb_checkpoints/Matter - Basic Interactions-checkpoint.ipynb

-4,218
This file was deleted.

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+5-5
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@ endpoint 0 {
19011901
callback attribute serverList;
19021902
callback attribute clientList;
19031903
callback attribute partsList;
1904-
ram attribute featureMap default = 0;
1904+
callback attribute featureMap;
19051905
callback attribute clusterRevision;
19061906
}
19071907

@@ -2105,7 +2105,7 @@ endpoint 1 {
21052105
callback attribute acceptedCommandList;
21062106
callback attribute eventList;
21072107
callback attribute attributeList;
2108-
ram attribute featureMap default = 0;
2108+
callback attribute featureMap;
21092109
callback attribute clusterRevision;
21102110
}
21112111

@@ -2192,7 +2192,7 @@ endpoint 2 {
21922192
callback attribute acceptedCommandList;
21932193
callback attribute eventList;
21942194
callback attribute attributeList;
2195-
ram attribute featureMap default = 0;
2195+
callback attribute featureMap;
21962196
callback attribute clusterRevision;
21972197
}
21982198

@@ -2433,7 +2433,7 @@ endpoint 3 {
24332433
callback attribute acceptedCommandList;
24342434
callback attribute eventList;
24352435
callback attribute attributeList;
2436-
ram attribute featureMap default = 0;
2436+
callback attribute featureMap;
24372437
callback attribute clusterRevision;
24382438
}
24392439

@@ -2477,7 +2477,7 @@ endpoint 4 {
24772477
callback attribute acceptedCommandList;
24782478
callback attribute eventList;
24792479
callback attribute attributeList;
2480-
ram attribute featureMap default = 0;
2480+
callback attribute featureMap;
24812481
callback attribute clusterRevision;
24822482
}
24832483

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.zap

+10-10
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@
139139
"side": "server",
140140
"type": "bitmap32",
141141
"included": 1,
142-
"storageOption": "RAM",
142+
"storageOption": "External",
143143
"singleton": 0,
144144
"bounded": 0,
145-
"defaultValue": "0",
145+
"defaultValue": null,
146146
"reportable": 1,
147147
"minInterval": 1,
148148
"maxInterval": 65534,
@@ -2445,10 +2445,10 @@
24452445
"side": "server",
24462446
"type": "bitmap32",
24472447
"included": 1,
2448-
"storageOption": "RAM",
2448+
"storageOption": "External",
24492449
"singleton": 0,
24502450
"bounded": 0,
2451-
"defaultValue": "0",
2451+
"defaultValue": null,
24522452
"reportable": 1,
24532453
"minInterval": 1,
24542454
"maxInterval": 65534,
@@ -3525,10 +3525,10 @@
35253525
"side": "server",
35263526
"type": "bitmap32",
35273527
"included": 1,
3528-
"storageOption": "RAM",
3528+
"storageOption": "External",
35293529
"singleton": 0,
35303530
"bounded": 0,
3531-
"defaultValue": "0",
3531+
"defaultValue": null,
35323532
"reportable": 1,
35333533
"minInterval": 1,
35343534
"maxInterval": 65534,
@@ -6822,10 +6822,10 @@
68226822
"side": "server",
68236823
"type": "bitmap32",
68246824
"included": 1,
6825-
"storageOption": "RAM",
6825+
"storageOption": "External",
68266826
"singleton": 0,
68276827
"bounded": 0,
6828-
"defaultValue": "0",
6828+
"defaultValue": null,
68296829
"reportable": 1,
68306830
"minInterval": 1,
68316831
"maxInterval": 65534,
@@ -7347,10 +7347,10 @@
73477347
"side": "server",
73487348
"type": "bitmap32",
73497349
"included": 1,
7350-
"storageOption": "RAM",
7350+
"storageOption": "External",
73517351
"singleton": 0,
73527352
"bounded": 0,
7353-
"defaultValue": "0",
7353+
"defaultValue": null,
73547354
"reportable": 1,
73557355
"minInterval": 1,
73567356
"maxInterval": 65534,

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@ endpoint 0 {
19921992
callback attribute serverList;
19931993
callback attribute clientList;
19941994
callback attribute partsList;
1995-
ram attribute featureMap default = 0;
1995+
callback attribute featureMap;
19961996
callback attribute clusterRevision;
19971997
}
19981998

@@ -2309,7 +2309,7 @@ endpoint 1 {
23092309
callback attribute acceptedCommandList;
23102310
callback attribute eventList;
23112311
callback attribute attributeList;
2312-
ram attribute featureMap default = 0;
2312+
callback attribute featureMap;
23132313
callback attribute clusterRevision;
23142314
}
23152315

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@
139139
"side": "server",
140140
"type": "bitmap32",
141141
"included": 1,
142-
"storageOption": "RAM",
142+
"storageOption": "External",
143143
"singleton": 0,
144144
"bounded": 0,
145-
"defaultValue": "0",
145+
"defaultValue": null,
146146
"reportable": 1,
147147
"minInterval": 1,
148148
"maxInterval": 65534,
@@ -4048,10 +4048,10 @@
40484048
"side": "server",
40494049
"type": "bitmap32",
40504050
"included": 1,
4051-
"storageOption": "RAM",
4051+
"storageOption": "External",
40524052
"singleton": 0,
40534053
"bounded": 0,
4054-
"defaultValue": "0",
4054+
"defaultValue": null,
40554055
"reportable": 1,
40564056
"minInterval": 1,
40574057
"maxInterval": 65534,

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+5-5
Original file line numberDiff line numberDiff line change
@@ -6296,7 +6296,7 @@ cluster RadonConcentrationMeasurement = 1071 {
62966296

62976297
/** This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol. */
62986298
cluster WakeOnLan = 1283 {
6299-
revision 1; // NOTE: Default/not specifically set
6299+
revision 1;
63006300

63016301
readonly attribute optional char_string<12> MACAddress = 0;
63026302
readonly attribute optional octet_string<16> linkLocalAddress = 1;
@@ -7057,7 +7057,7 @@ endpoint 0 {
70577057
callback attribute acceptedCommandList;
70587058
callback attribute eventList;
70597059
callback attribute attributeList;
7060-
ram attribute featureMap default = 0;
7060+
callback attribute featureMap;
70617061
callback attribute clusterRevision;
70627062
}
70637063

@@ -7638,7 +7638,7 @@ endpoint 1 {
76387638
callback attribute acceptedCommandList;
76397639
callback attribute eventList;
76407640
callback attribute attributeList;
7641-
ram attribute featureMap default = 0;
7641+
callback attribute featureMap;
76427642
callback attribute clusterRevision;
76437643
}
76447644

@@ -8909,7 +8909,7 @@ endpoint 2 {
89098909
callback attribute acceptedCommandList;
89108910
callback attribute eventList;
89118911
callback attribute attributeList;
8912-
ram attribute featureMap default = 0;
8912+
callback attribute featureMap;
89138913
callback attribute clusterRevision;
89148914
}
89158915

@@ -8978,7 +8978,7 @@ endpoint 65534 {
89788978
callback attribute acceptedCommandList;
89798979
callback attribute eventList;
89808980
callback attribute attributeList;
8981-
ram attribute featureMap default = 0;
8981+
callback attribute featureMap;
89828982
callback attribute clusterRevision;
89838983
}
89848984

0 commit comments

Comments
 (0)