Update Door Lock Cluster definitions (#12289)

* Add new cluster definition for a door lock * Remove door lock cluster definition from silabs XML - It was moved into matter data model directory * Update zap files for all the examples to reflect door lock changes * Tweak the door lock cluster so it uses new definitions * Fix java ZAP templates to support nullables and bitmaps * Fix style issues * Use proper types in the attribute definitions of the Door Lock Cluster * Update auto-generated files
project-chip · Mar 31, 2022 · 8796165 · 8796165
1 parent 4935ad8
commit 8796165
Show file tree

Hide file tree

Showing 59 changed files with 7,339 additions and 11,428 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
diff --git a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp
diff --git a/src/app/clusters/door-lock-server/door-lock-server-user.cpp b/src/app/clusters/door-lock-server/door-lock-server-user.cpp
diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -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>

diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -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",