From 30d195347317dba4a5f7c3c8a2b4911f3a3f73f6 Mon Sep 17 00:00:00 2001 From: Andrei Menzopol Date: Mon, 21 Oct 2024 21:06:21 +0300 Subject: [PATCH] Revert "[nxp toup][examples][common] Update zap files to support Aliro" This reverts commit 7ac537c794e8035e2f6ec7f4948c70752b7abb21. --- examples/lock-app/nxp/zap/lock-app.matter | 29 +- examples/lock-app/nxp/zap/lock-app.zap | 316 +--------------------- 2 files changed, 4 insertions(+), 341 deletions(-) diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 293f57132c55ca..c975e2b7c17d3c 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -2724,18 +2724,13 @@ endpoint 1 { ram attribute numberOfTotalUsersSupported default = 10; ram attribute numberOfPINUsersSupported default = 10; ram attribute numberOfRFIDUsersSupported default = 10; - ram attribute numberOfWeekDaySchedulesSupportedPerUser default = 10; - ram attribute numberOfYearDaySchedulesSupportedPerUser default = 10; - ram attribute numberOfHolidaySchedulesSupported default = 10; ram attribute maxPINCodeLength default = 8; ram attribute minPINCodeLength default = 6; ram attribute maxRFIDCodeLength default = 20; ram attribute minRFIDCodeLength default = 10; ram attribute credentialRulesSupport default = 1; ram attribute numberOfCredentialsSupportedPerUser default = 5; - ram attribute language default = "en"; - ram attribute autoRelockTime default = 60; - ram attribute soundVolume default = 0; + ram attribute autoRelockTime; ram attribute operatingMode default = 0x00; ram attribute supportedOperatingModes default = 0xFFF6; ram attribute enableOneTouchLocking default = 0x00; @@ -2743,36 +2738,16 @@ endpoint 1 { ram attribute wrongCodeEntryLimit default = 3; ram attribute userCodeTemporaryDisableTime default = 10; ram attribute requirePINforRemoteOperation default = 0; - callback attribute aliroReaderVerificationKey; - callback attribute aliroReaderGroupIdentifier; - callback attribute aliroReaderGroupSubIdentifier; - callback attribute aliroExpeditedTransactionSupportedProtocolVersions; - callback attribute aliroGroupResolvingKey; - callback attribute aliroSupportedBLEUWBProtocolVersions; - callback attribute aliroBLEAdvertisingVersion; - callback attribute numberOfAliroCredentialIssuerKeysSupported; - callback attribute numberOfAliroEndpointKeysSupported; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute eventList; callback attribute attributeList; - ram attribute featureMap default = 0x7DB3; + ram attribute featureMap default = 0x0001; ram attribute clusterRevision default = 7; handle command LockDoor; handle command UnlockDoor; handle command UnlockWithTimeout; - handle command SetWeekDaySchedule; - handle command GetWeekDaySchedule; - handle command GetWeekDayScheduleResponse; - handle command ClearWeekDaySchedule; - handle command SetYearDaySchedule; - handle command GetYearDaySchedule; - handle command GetYearDayScheduleResponse; - handle command ClearYearDaySchedule; - handle command SetHolidaySchedule; - handle command SetAliroReaderConfig; - handle command ClearAliroReaderConfig; } } diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index 19103e7bc18326..67da76956d2e1d 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -4210,94 +4210,6 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 - }, - { - "name": "SetWeekDaySchedule", - "code": 11, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "GetWeekDaySchedule", - "code": 12, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "GetWeekDayScheduleResponse", - "code": 12, - "mfgCode": null, - "source": "server", - "isIncoming": 0, - "isEnabled": 1 - }, - { - "name": "ClearWeekDaySchedule", - "code": 13, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "SetYearDaySchedule", - "code": 14, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "GetYearDaySchedule", - "code": 15, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "GetYearDayScheduleResponse", - "code": 15, - "mfgCode": null, - "source": "server", - "isIncoming": 0, - "isEnabled": 1 - }, - { - "name": "ClearYearDaySchedule", - "code": 16, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "SetHolidaySchedule", - "code": 17, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "SetAliroReaderConfig", - "code": 40, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - }, - { - "name": "ClearAliroReaderConfig", - "code": 41, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 } ], "attributes": [ @@ -4413,54 +4325,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "NumberOfWeekDaySchedulesSupportedPerUser", - "code": 20, - "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": "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": "10", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "MaxPINCodeLength", "code": 23, @@ -4557,22 +4421,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "Language", - "code": 33, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "en", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "AutoRelockTime", "code": 35, @@ -4583,23 +4431,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "60", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SoundVolume", - "code": 36, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -4717,150 +4549,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AliroReaderVerificationKey", - "code": 128, - "mfgCode": null, - "side": "server", - "type": "octet_string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AliroReaderGroupIdentifier", - "code": 129, - "mfgCode": null, - "side": "server", - "type": "octet_string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AliroReaderGroupSubIdentifier", - "code": 130, - "mfgCode": null, - "side": "server", - "type": "octet_string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AliroExpeditedTransactionSupportedProtocolVersions", - "code": 131, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AliroGroupResolvingKey", - "code": 132, - "mfgCode": null, - "side": "server", - "type": "octet_string", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AliroSupportedBLEUWBProtocolVersions", - "code": 133, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AliroBLEAdvertisingVersion", - "code": 134, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfAliroCredentialIssuerKeysSupported", - "code": 135, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "NumberOfAliroEndpointKeysSupported", - "code": 136, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "GeneratedCommandList", "code": 65528, @@ -4935,7 +4623,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x7DB3", + "defaultValue": "0x0001", "reportable": 1, "minInterval": 1, "maxInterval": 65534,