Skip to content

Commit 903e8b7

Browse files
committed
Update Device Versions
1 parent 863c61f commit 903e8b7

File tree

2 files changed

+116
-246
lines changed

2 files changed

+116
-246
lines changed

examples/lighting-app/lighting-common/lighting-app.matter

+63-193
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,23 @@ cluster OtaSoftwareUpdateRequestor = 42 {
974974
command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0;
975975
}
976976

977+
/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
978+
may have differing common languages, units of measurements, and numerical formatting
979+
standards. As such, Nodes that visually or audibly convey information need a mechanism by which
980+
they can be configured to use a user’s preferred language, units, etc */
981+
cluster LocalizationConfiguration = 43 {
982+
revision 1; // NOTE: Default/not specifically set
983+
984+
attribute access(write: manage) char_string<35> activeLocale = 0;
985+
readonly attribute char_string supportedLocales[] = 1;
986+
readonly attribute command_id generatedCommandList[] = 65528;
987+
readonly attribute command_id acceptedCommandList[] = 65529;
988+
readonly attribute event_id eventList[] = 65530;
989+
readonly attribute attrib_id attributeList[] = 65531;
990+
readonly attribute bitmap32 featureMap = 65532;
991+
readonly attribute int16u clusterRevision = 65533;
992+
}
993+
977994
/** This cluster is used to manage global aspects of the Commissioning flow. */
978995
cluster GeneralCommissioning = 48 {
979996
revision 1; // NOTE: Default/not specifically set
@@ -2093,162 +2110,6 @@ cluster UserLabel = 65 {
20932110
readonly attribute int16u clusterRevision = 65533;
20942111
}
20952112

2096-
/** Attributes and commands for scene configuration and manipulation. */
2097-
provisional cluster ScenesManagement = 98 {
2098-
revision 1;
2099-
2100-
bitmap CopyModeBitmap : bitmap8 {
2101-
kCopyAllScenes = 0x1;
2102-
}
2103-
2104-
bitmap Feature : bitmap32 {
2105-
kSceneNames = 0x1;
2106-
}
2107-
2108-
struct AttributeValuePairStruct {
2109-
attrib_id attributeID = 0;
2110-
optional int8u valueUnsigned8 = 1;
2111-
optional int8s valueSigned8 = 2;
2112-
optional int16u valueUnsigned16 = 3;
2113-
optional int16s valueSigned16 = 4;
2114-
optional int32u valueUnsigned32 = 5;
2115-
optional int32s valueSigned32 = 6;
2116-
optional int64u valueUnsigned64 = 7;
2117-
optional int64s valueSigned64 = 8;
2118-
}
2119-
2120-
struct ExtensionFieldSet {
2121-
cluster_id clusterID = 0;
2122-
AttributeValuePairStruct attributeValueList[] = 1;
2123-
}
2124-
2125-
fabric_scoped struct SceneInfoStruct {
2126-
int8u sceneCount = 0;
2127-
fabric_sensitive int8u currentScene = 1;
2128-
fabric_sensitive group_id currentGroup = 2;
2129-
fabric_sensitive boolean sceneValid = 3;
2130-
int8u remainingCapacity = 4;
2131-
fabric_idx fabricIndex = 254;
2132-
}
2133-
2134-
readonly attribute optional nullable node_id lastConfiguredBy = 0;
2135-
readonly attribute int16u sceneTableSize = 1;
2136-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
2137-
readonly attribute command_id generatedCommandList[] = 65528;
2138-
readonly attribute command_id acceptedCommandList[] = 65529;
2139-
readonly attribute event_id eventList[] = 65530;
2140-
readonly attribute attrib_id attributeList[] = 65531;
2141-
readonly attribute bitmap32 featureMap = 65532;
2142-
readonly attribute int16u clusterRevision = 65533;
2143-
2144-
request struct AddSceneRequest {
2145-
group_id groupID = 0;
2146-
int8u sceneID = 1;
2147-
int32u transitionTime = 2;
2148-
char_string sceneName = 3;
2149-
ExtensionFieldSet extensionFieldSets[] = 4;
2150-
}
2151-
2152-
response struct AddSceneResponse = 0 {
2153-
status status = 0;
2154-
group_id groupID = 1;
2155-
int8u sceneID = 2;
2156-
}
2157-
2158-
request struct ViewSceneRequest {
2159-
group_id groupID = 0;
2160-
int8u sceneID = 1;
2161-
}
2162-
2163-
response struct ViewSceneResponse = 1 {
2164-
status status = 0;
2165-
group_id groupID = 1;
2166-
int8u sceneID = 2;
2167-
optional int32u transitionTime = 3;
2168-
optional char_string sceneName = 4;
2169-
optional ExtensionFieldSet extensionFieldSets[] = 5;
2170-
}
2171-
2172-
request struct RemoveSceneRequest {
2173-
group_id groupID = 0;
2174-
int8u sceneID = 1;
2175-
}
2176-
2177-
response struct RemoveSceneResponse = 2 {
2178-
status status = 0;
2179-
group_id groupID = 1;
2180-
int8u sceneID = 2;
2181-
}
2182-
2183-
request struct RemoveAllScenesRequest {
2184-
group_id groupID = 0;
2185-
}
2186-
2187-
response struct RemoveAllScenesResponse = 3 {
2188-
status status = 0;
2189-
group_id groupID = 1;
2190-
}
2191-
2192-
request struct StoreSceneRequest {
2193-
group_id groupID = 0;
2194-
int8u sceneID = 1;
2195-
}
2196-
2197-
response struct StoreSceneResponse = 4 {
2198-
status status = 0;
2199-
group_id groupID = 1;
2200-
int8u sceneID = 2;
2201-
}
2202-
2203-
request struct RecallSceneRequest {
2204-
group_id groupID = 0;
2205-
int8u sceneID = 1;
2206-
optional nullable int32u transitionTime = 2;
2207-
}
2208-
2209-
request struct GetSceneMembershipRequest {
2210-
group_id groupID = 0;
2211-
}
2212-
2213-
response struct GetSceneMembershipResponse = 6 {
2214-
status status = 0;
2215-
nullable int8u capacity = 1;
2216-
group_id groupID = 2;
2217-
optional int8u sceneList[] = 3;
2218-
}
2219-
2220-
request struct CopySceneRequest {
2221-
CopyModeBitmap mode = 0;
2222-
group_id groupIdentifierFrom = 1;
2223-
int8u sceneIdentifierFrom = 2;
2224-
group_id groupIdentifierTo = 3;
2225-
int8u sceneIdentifierTo = 4;
2226-
}
2227-
2228-
response struct CopySceneResponse = 64 {
2229-
status status = 0;
2230-
group_id groupIdentifierFrom = 1;
2231-
int8u sceneIdentifierFrom = 2;
2232-
}
2233-
2234-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
2235-
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
2236-
/** Retrieves the requested scene entry from its Scene table. */
2237-
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
2238-
/** Removes the requested scene entry, corresponding to the value of the GroupID field, from its Scene Table */
2239-
fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
2240-
/** Remove all scenes, corresponding to the value of the GroupID field, from its Scene Table */
2241-
fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
2242-
/** Adds the scene entry into its Scene Table along with all extension field sets corresponding to the current state of other clusters on the same endpoint */
2243-
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
2244-
/** Set the attributes and corresponding state for each other cluster implemented on the endpoint accordingly to the resquested scene entry in the Scene Table */
2245-
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
2246-
/** Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group */
2247-
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
2248-
/** Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
2249-
fabric command access(invoke: manage) CopyScene(CopySceneRequest): CopySceneResponse = 64;
2250-
}
2251-
22522113
/** Attributes and commands for controlling the color properties of a color-capable light. */
22532114
cluster ColorControl = 768 {
22542115
revision 7;
@@ -2578,7 +2439,8 @@ cluster ColorControl = 768 {
25782439
}
25792440

25802441
endpoint 0 {
2581-
device type ma_rootdevice = 22, version 1;
2442+
device type ma_rootdevice = 22, version 3;
2443+
device type ma_otarequestor = 18, version 1;
25822444

25832445
binding cluster OtaSoftwareUpdateProvider;
25842446

@@ -2587,6 +2449,9 @@ endpoint 0 {
25872449
callback attribute serverList;
25882450
callback attribute clientList;
25892451
callback attribute partsList;
2452+
callback attribute generatedCommandList;
2453+
callback attribute acceptedCommandList;
2454+
callback attribute attributeList;
25902455
callback attribute featureMap;
25912456
callback attribute clusterRevision;
25922457
}
@@ -2595,10 +2460,11 @@ endpoint 0 {
25952460
emits event AccessControlEntryChanged;
25962461
emits event AccessControlExtensionChanged;
25972462
callback attribute acl;
2598-
callback attribute extension;
25992463
callback attribute subjectsPerAccessControlEntry;
26002464
callback attribute targetsPerAccessControlEntry;
26012465
callback attribute accessControlEntriesPerFabric;
2466+
callback attribute generatedCommandList;
2467+
callback attribute acceptedCommandList;
26022468
callback attribute attributeList;
26032469
ram attribute featureMap default = 0;
26042470
callback attribute clusterRevision;
@@ -2629,8 +2495,11 @@ endpoint 0 {
26292495
callback attribute capabilityMinima;
26302496
callback attribute specificationVersion;
26312497
callback attribute maxPathsPerInvoke;
2498+
callback attribute generatedCommandList;
2499+
callback attribute acceptedCommandList;
2500+
callback attribute attributeList;
26322501
ram attribute featureMap default = 0;
2633-
ram attribute clusterRevision default = 3;
2502+
ram attribute clusterRevision default = 4;
26342503
}
26352504

26362505
server cluster OtaSoftwareUpdateRequestor {
@@ -2641,20 +2510,36 @@ endpoint 0 {
26412510
ram attribute updatePossible default = 1;
26422511
ram attribute updateState default = 0;
26432512
ram attribute updateStateProgress default = 0;
2513+
callback attribute generatedCommandList;
2514+
callback attribute acceptedCommandList;
2515+
callback attribute attributeList;
26442516
ram attribute featureMap default = 0;
26452517
ram attribute clusterRevision default = 1;
26462518

26472519
handle command AnnounceOTAProvider;
26482520
}
26492521

2522+
server cluster LocalizationConfiguration {
2523+
ram attribute activeLocale;
2524+
callback attribute supportedLocales;
2525+
callback attribute generatedCommandList;
2526+
callback attribute acceptedCommandList;
2527+
callback attribute attributeList;
2528+
ram attribute featureMap default = 0;
2529+
ram attribute clusterRevision default = 1;
2530+
}
2531+
26502532
server cluster GeneralCommissioning {
26512533
ram attribute breadcrumb default = 0x0000000000000000;
26522534
callback attribute basicCommissioningInfo;
26532535
callback attribute regulatoryConfig;
26542536
callback attribute locationCapability;
26552537
callback attribute supportsConcurrentConnection;
2538+
callback attribute generatedCommandList;
2539+
callback attribute acceptedCommandList;
2540+
callback attribute attributeList;
26562541
ram attribute featureMap default = 0;
2657-
ram attribute clusterRevision default = 1;
2542+
ram attribute clusterRevision default = 2;
26582543

26592544
handle command ArmFailSafe;
26602545
handle command ArmFailSafeResponse;
@@ -2673,6 +2558,9 @@ endpoint 0 {
26732558
ram attribute lastNetworkingStatus;
26742559
ram attribute lastNetworkID;
26752560
ram attribute lastConnectErrorValue;
2561+
callback attribute generatedCommandList;
2562+
callback attribute acceptedCommandList;
2563+
callback attribute attributeList;
26762564
ram attribute featureMap default = 2;
26772565
ram attribute clusterRevision default = 1;
26782566

@@ -2708,6 +2596,9 @@ endpoint 0 {
27082596
callback attribute activeRadioFaults;
27092597
callback attribute activeNetworkFaults;
27102598
callback attribute testEventTriggersEnabled default = false;
2599+
callback attribute generatedCommandList;
2600+
callback attribute acceptedCommandList;
2601+
callback attribute attributeList;
27112602
callback attribute featureMap;
27122603
callback attribute clusterRevision;
27132604

@@ -2848,11 +2739,13 @@ endpoint 0 {
28482739
callback attribute windowStatus;
28492740
callback attribute adminFabricIndex;
28502741
callback attribute adminVendorId;
2742+
callback attribute generatedCommandList;
2743+
callback attribute acceptedCommandList;
2744+
callback attribute attributeList;
28512745
ram attribute featureMap default = 0;
28522746
ram attribute clusterRevision default = 1;
28532747

28542748
handle command OpenCommissioningWindow;
2855-
handle command OpenBasicCommissioningWindow;
28562749
handle command RevokeCommissioning;
28572750
}
28582751

@@ -2863,6 +2756,9 @@ endpoint 0 {
28632756
callback attribute commissionedFabrics;
28642757
callback attribute trustedRootCertificates;
28652758
callback attribute currentFabricIndex;
2759+
callback attribute generatedCommandList;
2760+
callback attribute acceptedCommandList;
2761+
callback attribute attributeList;
28662762
ram attribute featureMap default = 0;
28672763
ram attribute clusterRevision default = 1;
28682764

@@ -2885,6 +2781,9 @@ endpoint 0 {
28852781
callback attribute groupTable;
28862782
callback attribute maxGroupsPerFabric;
28872783
callback attribute maxGroupKeysPerFabric;
2784+
callback attribute generatedCommandList;
2785+
callback attribute acceptedCommandList;
2786+
callback attribute attributeList;
28882787
callback attribute featureMap;
28892788
callback attribute clusterRevision;
28902789

@@ -2909,14 +2808,14 @@ endpoint 0 {
29092808
}
29102809
}
29112810
endpoint 1 {
2912-
device type ma_dimmablelight = 257, version 1;
2811+
device type ma_dimmablelight = 257, version 3;
29132812

29142813

29152814
server cluster Identify {
29162815
ram attribute identifyTime default = 0x0000;
29172816
ram attribute identifyType default = 0x0;
29182817
ram attribute featureMap default = 0;
2919-
ram attribute clusterRevision default = 4;
2818+
ram attribute clusterRevision default = 5;
29202819

29212820
handle command Identify;
29222821
handle command TriggerEffect;
@@ -2946,7 +2845,7 @@ endpoint 1 {
29462845
ram attribute offWaitTime default = 0x0000;
29472846
persist attribute startUpOnOff default = 0xFF;
29482847
ram attribute featureMap default = 1;
2949-
ram attribute clusterRevision default = 5;
2848+
ram attribute clusterRevision default = 6;
29502849

29512850
handle command Off;
29522851
handle command On;
@@ -2961,9 +2860,6 @@ endpoint 1 {
29612860
ram attribute remainingTime default = 0x0000;
29622861
ram attribute minLevel default = 0x01;
29632862
ram attribute maxLevel default = 0xFE;
2964-
ram attribute currentFrequency default = 0x0000;
2965-
ram attribute minFrequency default = 0x0000;
2966-
ram attribute maxFrequency default = 0x0000;
29672863
ram attribute options default = 0x00;
29682864
ram attribute onOffTransitionTime default = 0x0000;
29692865
ram attribute onLevel default = 0xFF;
@@ -2993,32 +2889,6 @@ endpoint 1 {
29932889
callback attribute clusterRevision;
29942890
}
29952891

2996-
server cluster ScenesManagement {
2997-
ram attribute lastConfiguredBy;
2998-
ram attribute sceneTableSize default = 16;
2999-
callback attribute fabricSceneInfo;
3000-
callback attribute generatedCommandList;
3001-
callback attribute acceptedCommandList;
3002-
callback attribute attributeList;
3003-
ram attribute featureMap default = 1;
3004-
ram attribute clusterRevision default = 1;
3005-
3006-
handle command AddScene;
3007-
handle command AddSceneResponse;
3008-
handle command ViewScene;
3009-
handle command ViewSceneResponse;
3010-
handle command RemoveScene;
3011-
handle command RemoveSceneResponse;
3012-
handle command RemoveAllScenes;
3013-
handle command RemoveAllScenesResponse;
3014-
handle command StoreScene;
3015-
handle command StoreSceneResponse;
3016-
handle command RecallScene;
3017-
handle command GetSceneMembership;
3018-
handle command GetSceneMembershipResponse;
3019-
handle command CopyScene;
3020-
}
3021-
30222892
server cluster ColorControl {
30232893
persist attribute currentHue default = 0x00;
30242894
persist attribute currentSaturation default = 0x00;

0 commit comments

Comments
 (0)