Skip to content

Commit 6519522

Browse files
authored
Merge branch 'master' into granbery/power_topology_xml
2 parents 65fe626 + cd3e498 commit 6519522

File tree

617 files changed

+33270
-15339
lines changed

Some content is hidden

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

617 files changed

+33270
-15339
lines changed

.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ GPL
634634
GPLv
635635
Gradle
636636
gradlew
637+
graphviz
637638
Groupcast
638639
GroupId
639640
GroupKeyManagement

.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
@@ -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+

data_model/ValveConfigurationControl.xml

-207
This file was deleted.

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 |

0 commit comments

Comments
 (0)