Skip to content

Commit a730bf4

Browse files
committed
Merge branch 'granbery/electrical_measurement' of github.com:hasty/connectedhomeip into granbery/electrical_measurement
2 parents 0ed559c + d87f897 commit a730bf4

File tree

248 files changed

+19701
-4609
lines changed

Some content is hidden

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

248 files changed

+19701
-4609
lines changed

.github/workflows/examples-nrfconnect.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
platform: nrfconnect
5151
- name: Detect changed paths
52-
uses: dorny/paths-filter@v2
52+
uses: dorny/paths-filter@v3
5353
id: changed_paths
5454
with:
5555
filters: |

.github/workflows/tests.yaml

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

data_model/ValveConfigurationControl.xml

-207
This file was deleted.

docs/clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ Generally regenerate using one of:
8080
| 144 | 0x90 | ElectricalPowerMeasurement |
8181
| 145 | 0x91 | ElectricalEnergyMeasurement |
8282
| 150 | 0x96 | DemandResponseLoadControl |
83+
| 151 | 0x97 | Messages |
8384
| 152 | 0x98 | DeviceEnergyManagement |
8485
| 153 | 0x99 | EnergyEvse |
8586
| 155 | 0x9B | EnergyPreference |

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

+5-10
Original file line numberDiff line numberDiff line change
@@ -2929,7 +2929,7 @@ cluster RvcRunMode = 84 {
29292929
}
29302930

29312931
bitmap Feature : bitmap32 {
2932-
kOnOff = 0x1;
2932+
kNoFeatures = 0x0;
29332933
}
29342934

29352935
struct ModeTagStruct {
@@ -2945,7 +2945,6 @@ cluster RvcRunMode = 84 {
29452945

29462946
readonly attribute ModeOptionStruct supportedModes[] = 0;
29472947
readonly attribute int8u currentMode = 1;
2948-
attribute optional nullable int8u onMode = 3;
29492948
readonly attribute command_id generatedCommandList[] = 65528;
29502949
readonly attribute command_id acceptedCommandList[] = 65529;
29512950
readonly attribute event_id eventList[] = 65530;
@@ -2982,7 +2981,7 @@ cluster RvcCleanMode = 85 {
29822981
}
29832982

29842983
bitmap Feature : bitmap32 {
2985-
kOnOff = 0x1;
2984+
kNoFeatures = 0x0;
29862985
}
29872986

29882987
struct ModeTagStruct {
@@ -2998,7 +2997,6 @@ cluster RvcCleanMode = 85 {
29982997

29992998
readonly attribute ModeOptionStruct supportedModes[] = 0;
30002999
readonly attribute int8u currentMode = 1;
3001-
attribute optional nullable int8u onMode = 3;
30023000
readonly attribute command_id generatedCommandList[] = 65528;
30033001
readonly attribute command_id acceptedCommandList[] = 65529;
30043002
readonly attribute event_id eventList[] = 65530;
@@ -3480,10 +3478,6 @@ cluster RvcOperationalState = 97 {
34803478

34813479
/** Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server. */
34823480
command Pause(): OperationalCommandResponse = 0;
3483-
/** Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. */
3484-
command Stop(): OperationalCommandResponse = 1;
3485-
/** Upon receipt, the device SHALL start its operation if it is safe to do so and the device is in an operational state from which it can be started. */
3486-
command Start(): OperationalCommandResponse = 2;
34873481
/** Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press). */
34883482
command Resume(): OperationalCommandResponse = 3;
34893483
/** On receipt of this command, the device SHALL start seeking the charging dock, if possible in the current state of the device. */
@@ -7912,9 +7906,9 @@ endpoint 1 {
79127906
server cluster RvcRunMode {
79137907
callback attribute supportedModes;
79147908
callback attribute currentMode;
7915-
callback attribute onMode;
79167909
callback attribute generatedCommandList;
79177910
callback attribute acceptedCommandList;
7911+
callback attribute eventList;
79187912
callback attribute attributeList;
79197913
callback attribute featureMap;
79207914
ram attribute clusterRevision default = 2;
@@ -7926,9 +7920,9 @@ endpoint 1 {
79267920
server cluster RvcCleanMode {
79277921
callback attribute supportedModes;
79287922
callback attribute currentMode;
7929-
callback attribute onMode;
79307923
callback attribute generatedCommandList;
79317924
callback attribute acceptedCommandList;
7925+
callback attribute eventList;
79327926
callback attribute attributeList;
79337927
callback attribute featureMap;
79347928
ram attribute clusterRevision default = 2;
@@ -8076,6 +8070,7 @@ endpoint 1 {
80768070
callback attribute operationalError;
80778071
callback attribute generatedCommandList;
80788072
callback attribute acceptedCommandList;
8073+
callback attribute eventList;
80798074
callback attribute attributeList;
80808075
ram attribute featureMap default = 0;
80818076
ram attribute clusterRevision default = 1;

0 commit comments

Comments
 (0)