From 33146092718b407e02f95fcb7fc803d918289b5d Mon Sep 17 00:00:00 2001
From: C Freeman <cecille@google.com>
Date: Mon, 16 Oct 2023 10:53:43 -0400
Subject: [PATCH] all-clusters: Fix conformance on door-lock (#29743)

* all-clusters: Fix conformance on door-lock

Door lock currently supports features 3, 4, 5, and 6, all of which
require the DPS feature. As all the supported pieces for this feature
are already on, I turned on the feature (bit 5)

Door lock currently support feature 0x33, which requires the COTA
feature (bit 7), so I turned this feature on.

Door lock currently has on the YDSCH and HDSCH features in the
feature map. This looks deliberate, but it requires the commands
0x10, 0x11, 0x12 (both ways) and 0x13, so I turned these commands on.

* Turn off YDSCH and HDSCH features and cmds / attrs
---
 .../all-clusters-app.matter                   |  6 +--
 .../all-clusters-common/all-clusters-app.zap  | 46 +++----------------
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index f4d14a49f75c8b..be8ffe2888b4b2 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3636,8 +3636,6 @@ server cluster DoorLock = 257 {
   readonly attribute int16u numberOfPINUsersSupported = 18;
   readonly attribute int16u numberOfRFIDUsersSupported = 19;
   readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
-  readonly attribute int8u numberOfYearDaySchedulesSupportedPerUser = 21;
-  readonly attribute int8u numberOfHolidaySchedulesSupported = 22;
   readonly attribute int8u maxPINCodeLength = 23;
   readonly attribute int8u minPINCodeLength = 24;
   readonly attribute int8u maxRFIDCodeLength = 25;
@@ -7152,8 +7150,6 @@ endpoint 1 {
     ram      attribute numberOfPINUsersSupported default = 10;
     ram      attribute numberOfRFIDUsersSupported default = 10;
     ram      attribute numberOfWeekDaySchedulesSupportedPerUser default = 10;
-    ram      attribute numberOfYearDaySchedulesSupportedPerUser default = 10;
-    ram      attribute numberOfHolidaySchedulesSupported default = 0;
     ram      attribute maxPINCodeLength default = 6;
     ram      attribute minPINCodeLength default = 6;
     ram      attribute maxRFIDCodeLength default = 20;
@@ -7172,7 +7168,7 @@ endpoint 1 {
     ram      attribute wrongCodeEntryLimit default = 3;
     ram      attribute userCodeTemporaryDisableTime default = 10;
     ram      attribute requirePINforRemoteOperation default = 0;
-    ram      attribute featureMap default = 0x1D13;
+    ram      attribute featureMap default = 0x11B3;
     ram      attribute clusterRevision default = 6;
 
     handle command LockDoor;
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
index dcb6cdccd0aa3c..dfafcec91a0d10 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data with some extensions"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
@@ -11997,38 +11997,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "NumberOfYearDaySchedulesSupportedPerUser",
-              "code": 21,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "10",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "NumberOfHolidaySchedulesSupported",
-              "code": 22,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "MaxPINCodeLength",
               "code": 23,
@@ -12327,7 +12295,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x1D13",
+              "defaultValue": "0x11B3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,