Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Door Lock Cluster definitions #12289

Merged
merged 9 commits into from
Dec 3, 2021
Merged

Update Door Lock Cluster definitions #12289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
517ace0
Add new cluster definition for a door lock
Morozov-5F Nov 24, 2021
d4565f7
Remove door lock cluster definition from silabs XML
Morozov-5F Nov 24, 2021
92aee06
Update zap files for all the examples to reflect door lock changes
Morozov-5F Nov 24, 2021
a62283b
Tweak the door lock cluster so it uses new definitions
Morozov-5F Nov 25, 2021
7abf396
Fix java ZAP templates to support nullables and bitmaps
Morozov-5F Nov 25, 2021
8617621
Fix style issues
Morozov-5F Nov 28, 2021
d1591fa
Use proper types in the attribute definitions of the Door Lock Cluster
Morozov-5F Dec 2, 2021
ae791d4
Update auto-generated files
Morozov-5F Dec 2, 2021
b61bb8c
Merge branch 'master' into feature/update-door-lock-cluster-definitions
Morozov-5F Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
391 changes: 179 additions & 212 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop

Large diffs are not rendered by default.

118 changes: 43 additions & 75 deletions examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
View file
Open in desktop

Large diffs are not rendered by default.

118 changes: 43 additions & 75 deletions examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
View file
Open in desktop

Large diffs are not rendered by default.

234 changes: 85 additions & 149 deletions examples/thermostat/thermostat-common/thermostat.zap
View file
Open in desktop

Large diffs are not rendered by default.

118 changes: 43 additions & 75 deletions examples/tv-app/tv-common/tv-app.zap
View file
Open in desktop

Large diffs are not rendered by default.

400 changes: 188 additions & 212 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
View file
Open in desktop

Large diffs are not rendered by default.

168 changes: 51 additions & 117 deletions src/app/clusters/door-lock-server/door-lock-server-schedule.cpp
View file
Open in desktop

Large diffs are not rendered by default.

233 changes: 75 additions & 158 deletions src/app/clusters/door-lock-server/door-lock-server-user.cpp
View file
Open in desktop

Large diffs are not rendered by default.

957 changes: 957 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 18 additions & 12 deletions src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,28 +2149,34 @@ limitations under the License.
<include cluster="Door Lock" client="true" server="true" clientLocked="true" serverLocked="true">
<requireCommand>LockDoor</requireCommand>
<requireCommand>UnlockDoor</requireCommand>
<requireCommand>Toggle</requireCommand>
<requireCommand>UnlockWithTimeout</requireCommand>
<requireCommand>GetLogRecord</requireCommand>
<requireCommand>SetPin</requireCommand>
<requireCommand>GetPin</requireCommand>
<requireCommand>ClearPin</requireCommand>
<requireCommand>ClearAllPins</requireCommand>
<requireCommand>SetWeekdaySchedule</requireCommand>
<requireCommand>GetWeekdaySchedule</requireCommand>
<requireCommand>ClearWeekdaySchedule</requireCommand>
<requireCommand>GetLogRecordResponse</requireCommand>
<requireCommand>SetPINCode</requireCommand>
<requireCommand>GetPINCode</requireCommand>
<requireCommand>GetPINCodeResponse</requireCommand>
<requireCommand>ClearPINCode</requireCommand>
<requireCommand>ClearAllPINCodes</requireCommand>
<requireCommand>SetWeekDaySchedule</requireCommand>
<requireCommand>GetWeekDaySchedule</requireCommand>
<requireCommand>GetWeekDayScheduleResponse</requireCommand>
<requireCommand>ClearWeekDaySchedule</requireCommand>
<requireCommand>SetYearDaySchedule</requireCommand>
<requireCommand>GetYearDaySchedule</requireCommand>
<requireCommand>GetYearDayScheduleResponse</requireCommand>
<requireCommand>ClearYearDaySchedule</requireCommand>
<requireCommand>SetHolidaySchedule</requireCommand>
<requireCommand>GetHolidaySchedule</requireCommand>
<requireCommand>GetHolidayScheduleResponse</requireCommand>
<requireCommand>ClearHolidaySchedule</requireCommand>
<requireCommand>SetUserType</requireCommand>
<requireCommand>GetUserType</requireCommand>
<requireCommand>SetRfid</requireCommand>
<requireCommand>GetRfid</requireCommand>
<requireCommand>ClearRfid</requireCommand>
<requireCommand>ClearAllRfids</requireCommand>
<requireCommand>GetUserTypeResponse</requireCommand>
<requireCommand>SetRFIDCode</requireCommand>
<requireCommand>GetRFIDCode</requireCommand>
<requireCommand>GetRFIDCodeResponse</requireCommand>
<requireCommand>ClearRFIDCode</requireCommand>
<requireCommand>ClearAllRFIDCodes</requireCommand>
</include>
<include cluster="Groups" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>GROUP_NAME_SUPPORT</requireAttribute>
Expand Down
441 changes: 0 additions & 441 deletions src/app/zap-templates/zcl/data-model/silabs/ha.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"content-launch-cluster.xml",
"descriptor-cluster.xml",
"diagnostic-logs-cluster.xml",
"door-lock-cluster.xml",
"ethernet-network-diagnostics-cluster.xml",
"fixed-label-cluster.xml",
"flow-measurement-cluster.xml",
Expand Down
Loading