Skip to content

Commit 6fa2914

Browse files
[Bugfix] Waterleakdetector ScenesManagement build issue (project-chip#35406)
* Fixed default SceneTableSize value in waterleakdetector and improved the ifdef detection of the define * Removed Scenes Management from waterleak detector and template
1 parent 48df767 commit 6fa2914

File tree

4 files changed

+14
-718
lines changed

4 files changed

+14
-718
lines changed

examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter

-182
Original file line numberDiff line numberDiff line change
@@ -1357,162 +1357,6 @@ cluster BooleanState = 69 {
13571357
readonly attribute int16u clusterRevision = 65533;
13581358
}
13591359

1360-
/** Attributes and commands for scene configuration and manipulation. */
1361-
provisional cluster ScenesManagement = 98 {
1362-
revision 1;
1363-
1364-
bitmap CopyModeBitmap : bitmap8 {
1365-
kCopyAllScenes = 0x1;
1366-
}
1367-
1368-
bitmap Feature : bitmap32 {
1369-
kSceneNames = 0x1;
1370-
}
1371-
1372-
struct AttributeValuePairStruct {
1373-
attrib_id attributeID = 0;
1374-
optional int8u valueUnsigned8 = 1;
1375-
optional int8s valueSigned8 = 2;
1376-
optional int16u valueUnsigned16 = 3;
1377-
optional int16s valueSigned16 = 4;
1378-
optional int32u valueUnsigned32 = 5;
1379-
optional int32s valueSigned32 = 6;
1380-
optional int64u valueUnsigned64 = 7;
1381-
optional int64s valueSigned64 = 8;
1382-
}
1383-
1384-
struct ExtensionFieldSet {
1385-
cluster_id clusterID = 0;
1386-
AttributeValuePairStruct attributeValueList[] = 1;
1387-
}
1388-
1389-
fabric_scoped struct SceneInfoStruct {
1390-
int8u sceneCount = 0;
1391-
fabric_sensitive int8u currentScene = 1;
1392-
fabric_sensitive group_id currentGroup = 2;
1393-
fabric_sensitive boolean sceneValid = 3;
1394-
int8u remainingCapacity = 4;
1395-
fabric_idx fabricIndex = 254;
1396-
}
1397-
1398-
readonly attribute optional nullable node_id lastConfiguredBy = 0;
1399-
readonly attribute int16u sceneTableSize = 1;
1400-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
1401-
readonly attribute command_id generatedCommandList[] = 65528;
1402-
readonly attribute command_id acceptedCommandList[] = 65529;
1403-
readonly attribute event_id eventList[] = 65530;
1404-
readonly attribute attrib_id attributeList[] = 65531;
1405-
readonly attribute bitmap32 featureMap = 65532;
1406-
readonly attribute int16u clusterRevision = 65533;
1407-
1408-
request struct AddSceneRequest {
1409-
group_id groupID = 0;
1410-
int8u sceneID = 1;
1411-
int32u transitionTime = 2;
1412-
char_string sceneName = 3;
1413-
ExtensionFieldSet extensionFieldSets[] = 4;
1414-
}
1415-
1416-
response struct AddSceneResponse = 0 {
1417-
status status = 0;
1418-
group_id groupID = 1;
1419-
int8u sceneID = 2;
1420-
}
1421-
1422-
request struct ViewSceneRequest {
1423-
group_id groupID = 0;
1424-
int8u sceneID = 1;
1425-
}
1426-
1427-
response struct ViewSceneResponse = 1 {
1428-
status status = 0;
1429-
group_id groupID = 1;
1430-
int8u sceneID = 2;
1431-
optional int32u transitionTime = 3;
1432-
optional char_string sceneName = 4;
1433-
optional ExtensionFieldSet extensionFieldSets[] = 5;
1434-
}
1435-
1436-
request struct RemoveSceneRequest {
1437-
group_id groupID = 0;
1438-
int8u sceneID = 1;
1439-
}
1440-
1441-
response struct RemoveSceneResponse = 2 {
1442-
status status = 0;
1443-
group_id groupID = 1;
1444-
int8u sceneID = 2;
1445-
}
1446-
1447-
request struct RemoveAllScenesRequest {
1448-
group_id groupID = 0;
1449-
}
1450-
1451-
response struct RemoveAllScenesResponse = 3 {
1452-
status status = 0;
1453-
group_id groupID = 1;
1454-
}
1455-
1456-
request struct StoreSceneRequest {
1457-
group_id groupID = 0;
1458-
int8u sceneID = 1;
1459-
}
1460-
1461-
response struct StoreSceneResponse = 4 {
1462-
status status = 0;
1463-
group_id groupID = 1;
1464-
int8u sceneID = 2;
1465-
}
1466-
1467-
request struct RecallSceneRequest {
1468-
group_id groupID = 0;
1469-
int8u sceneID = 1;
1470-
optional nullable int32u transitionTime = 2;
1471-
}
1472-
1473-
request struct GetSceneMembershipRequest {
1474-
group_id groupID = 0;
1475-
}
1476-
1477-
response struct GetSceneMembershipResponse = 6 {
1478-
status status = 0;
1479-
nullable int8u capacity = 1;
1480-
group_id groupID = 2;
1481-
optional int8u sceneList[] = 3;
1482-
}
1483-
1484-
request struct CopySceneRequest {
1485-
CopyModeBitmap mode = 0;
1486-
group_id groupIdentifierFrom = 1;
1487-
int8u sceneIdentifierFrom = 2;
1488-
group_id groupIdentifierTo = 3;
1489-
int8u sceneIdentifierTo = 4;
1490-
}
1491-
1492-
response struct CopySceneResponse = 64 {
1493-
status status = 0;
1494-
group_id groupIdentifierFrom = 1;
1495-
int8u sceneIdentifierFrom = 2;
1496-
}
1497-
1498-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
1499-
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
1500-
/** Retrieves the requested scene entry from its Scene table. */
1501-
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
1502-
/** Removes the requested scene entry, corresponding to the value of the GroupID field, from its Scene Table */
1503-
fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
1504-
/** Remove all scenes, corresponding to the value of the GroupID field, from its Scene Table */
1505-
fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
1506-
/** 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 */
1507-
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
1508-
/** Set the attributes and corresponding state for each other cluster implemented on the endpoint accordingly to the resquested scene entry in the Scene Table */
1509-
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
1510-
/** 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 */
1511-
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
1512-
/** Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
1513-
fabric command CopyScene(CopySceneRequest): CopySceneResponse = 64;
1514-
}
1515-
15161360
/** This cluster is used to configure a boolean sensor. */
15171361
cluster BooleanStateConfiguration = 128 {
15181362
revision 1;
@@ -1818,32 +1662,6 @@ endpoint 1 {
18181662
ram attribute clusterRevision default = 1;
18191663
}
18201664

1821-
server cluster ScenesManagement {
1822-
ram attribute lastConfiguredBy;
1823-
ram attribute sceneTableSize;
1824-
callback attribute fabricSceneInfo;
1825-
callback attribute generatedCommandList;
1826-
callback attribute acceptedCommandList;
1827-
callback attribute eventList;
1828-
callback attribute attributeList;
1829-
ram attribute featureMap default = 1;
1830-
ram attribute clusterRevision default = 6;
1831-
1832-
handle command AddScene;
1833-
handle command AddSceneResponse;
1834-
handle command ViewScene;
1835-
handle command ViewSceneResponse;
1836-
handle command RemoveScene;
1837-
handle command RemoveSceneResponse;
1838-
handle command RemoveAllScenes;
1839-
handle command RemoveAllScenesResponse;
1840-
handle command StoreScene;
1841-
handle command StoreSceneResponse;
1842-
handle command RecallScene;
1843-
handle command GetSceneMembership;
1844-
handle command GetSceneMembershipResponse;
1845-
}
1846-
18471665
server cluster BooleanStateConfiguration {
18481666
callback attribute generatedCommandList;
18491667
callback attribute acceptedCommandList;

0 commit comments

Comments
 (0)