Skip to content

Commit a299d8a

Browse files
andy31415Alami-Amine
authored andcommitted
Update all-clusters and lighting to latest zap files and update golden test files (project-chip#33825)
* Update all-clusters and lighting to latest zap files and update golden unit test files * zap regen
1 parent c15fb63 commit a299d8a

File tree

10 files changed

+14394
-3978
lines changed

10 files changed

+14394
-3978
lines changed

scripts/tools/zap/tests/inputs/all-clusters-app.zap

+11,414-2,678
Large diffs are not rendered by default.

scripts/tools/zap/tests/inputs/lighting-app.zap

+354-168
Large diffs are not rendered by default.

scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp

+315-229
Large diffs are not rendered by default.

scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h

+75-117
Large diffs are not rendered by default.

scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h

+1,771-588
Large diffs are not rendered by default.

scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h

+258-65
Large diffs are not rendered by default.

scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
443443
}
444444
break;
445445
}
446+
case Commands::TimeSnapshot::Id: {
447+
Commands::TimeSnapshot::DecodableType commandData;
448+
TLVError = DataModel::Decode(aDataTlv, commandData);
449+
if (TLVError == CHIP_NO_ERROR)
450+
{
451+
wasHandled = emberAfGeneralDiagnosticsClusterTimeSnapshotCallback(apCommandObj, aCommandPath, commandData);
452+
}
453+
break;
454+
}
446455
default: {
447456
// Unrecognized command ID, error status will apply.
448457
apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);

scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h

+12
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@
205205
0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
206206
0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
207207
0x0000003F, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
208+
0x00000062, /* Cluster: Scenes Management, Command: AddScene, Privilege: manage */ \
209+
0x00000062, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
210+
0x00000062, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
211+
0x00000062, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
208212
}
209213

210214
// Parallel array data (cluster, *command*, privilege) for invoke command
@@ -243,6 +247,10 @@
243247
0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
244248
0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
245249
0x00000004, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
250+
0x00000000, /* Cluster: Scenes Management, Command: AddScene, Privilege: manage */ \
251+
0x00000002, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
252+
0x00000003, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
253+
0x00000004, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
246254
}
247255

248256
// Parallel array data (cluster, command, *privilege*) for invoke command
@@ -281,6 +289,10 @@
281289
chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
282290
chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
283291
chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
292+
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: AddScene, Privilege: manage */ \
293+
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
294+
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
295+
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
284296
}
285297

286298
////////////////////////////////////////////////////////////////////////////////

scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h

+168-132
Large diffs are not rendered by default.

scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h

+18-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
/**** Cluster endpoint counts ****/
2424
#define MATTER_DM_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
25-
#define MATTER_DM_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
25+
#define MATTER_DM_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
2626
#define MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
2727
#define MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
2828
#define MATTER_DM_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
@@ -46,6 +46,7 @@
4646
#define MATTER_DM_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
4747
#define MATTER_DM_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
4848
#define MATTER_DM_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
49+
#define MATTER_DM_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
4950
#define MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
5051
#define MATTER_DM_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
5152

@@ -179,6 +180,22 @@
179180
#define MATTER_DM_PLUGIN_USER_LABEL_SERVER
180181
#define MATTER_DM_PLUGIN_USER_LABEL
181182

183+
// Use this macro to check if the server side of the Scenes Management cluster is included
184+
#define ZCL_USING_SCENES_CLUSTER_SERVER
185+
#define MATTER_DM_PLUGIN_SCENES_MANAGEMENT_SERVER
186+
#define MATTER_DM_PLUGIN_SCENES_MANAGEMENT
187+
// User options for server plugin Scenes Management
188+
// Cluster spec 1.4.8.7
189+
#define SCENES_MANAGEMENT_TABLE_SIZE 16
190+
// Scenes FeatureMap Attribute Toggle Scenes Name feature
191+
// App cluster specs 1.4.4
192+
#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
193+
#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0001 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
194+
// Scenes FeatureMap Table Size feature used for the SCENES_MANAGEMENT_TABLE_SIZE define
195+
// App cluster specs 1.4.4.2
196+
#define MATTER_CLUSTER_TABLE_SIZE_SUPPORT_MASK 0x0001
197+
#define MATTER_CLUSTER_TABLE_SIZE_SUPPORT (0x0001 & MATTER_CLUSTER_TABLE_SIZE_SUPPORT_MASK)
198+
182199
// Use this macro to check if the server side of the Color Control cluster is included
183200
#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
184201
#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER

0 commit comments

Comments
 (0)