Skip to content

Commit

Permalink
Update all-clusters and lighting to latest zap files and update golde…
Browse files Browse the repository at this point in the history
…n test files (#33825)

* Update all-clusters and lighting to latest zap files and update golden unit test files

* zap regen
  • Loading branch information
andy31415 authored Jun 11, 2024
1 parent 3ebfbcf commit bfa3e6f
Show file tree
Hide file tree
Showing 10 changed files with 14,394 additions and 3,978 deletions.
14,092 changes: 11,414 additions & 2,678 deletions scripts/tools/zap/tests/inputs/all-clusters-app.zap

Large diffs are not rendered by default.

522 changes: 354 additions & 168 deletions scripts/tools/zap/tests/inputs/lighting-app.zap

Large diffs are not rendered by default.

Large diffs are not rendered by default.

192 changes: 75 additions & 117 deletions scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h

Large diffs are not rendered by default.

2,359 changes: 1,771 additions & 588 deletions scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,15 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
}
break;
}
case Commands::TimeSnapshot::Id: {
Commands::TimeSnapshot::DecodableType commandData;
TLVError = DataModel::Decode(aDataTlv, commandData);
if (TLVError == CHIP_NO_ERROR)
{
wasHandled = emberAfGeneralDiagnosticsClusterTimeSnapshotCallback(apCommandObj, aCommandPath, commandData);
}
break;
}
default: {
// Unrecognized command ID, error status will apply.
apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@
0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
0x0000003F, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
0x00000062, /* Cluster: Scenes Management, Command: AddScene, Privilege: manage */ \
0x00000062, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
0x00000062, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
0x00000062, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
}

// Parallel array data (cluster, *command*, privilege) for invoke command
Expand Down Expand Up @@ -243,6 +247,10 @@
0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
0x00000004, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
0x00000000, /* Cluster: Scenes Management, Command: AddScene, Privilege: manage */ \
0x00000002, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
0x00000003, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
0x00000004, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
}

// Parallel array data (cluster, command, *privilege*) for invoke command
Expand Down Expand Up @@ -281,6 +289,10 @@
chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetReadAllIndices, Privilege: administer */ \
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: AddScene, Privilege: manage */ \
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
}

////////////////////////////////////////////////////////////////////////////////
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

/**** Cluster endpoint counts ****/
#define MATTER_DM_IDENTIFY_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define MATTER_DM_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2)
Expand All @@ -46,6 +46,7 @@
#define MATTER_DM_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define MATTER_DM_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1)

Expand Down Expand Up @@ -179,6 +180,22 @@
#define MATTER_DM_PLUGIN_USER_LABEL_SERVER
#define MATTER_DM_PLUGIN_USER_LABEL

// Use this macro to check if the server side of the Scenes Management cluster is included
#define ZCL_USING_SCENES_CLUSTER_SERVER
#define MATTER_DM_PLUGIN_SCENES_MANAGEMENT_SERVER
#define MATTER_DM_PLUGIN_SCENES_MANAGEMENT
// User options for server plugin Scenes Management
// Cluster spec 1.4.8.7
#define SCENES_MANAGEMENT_TABLE_SIZE 16
// Scenes FeatureMap Attribute Toggle Scenes Name feature
// App cluster specs 1.4.4
#define MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK 0x0001
#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0001 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
// Scenes FeatureMap Table Size feature used for the SCENES_MANAGEMENT_TABLE_SIZE define
// App cluster specs 1.4.4.2
#define MATTER_CLUSTER_TABLE_SIZE_SUPPORT_MASK 0x0001
#define MATTER_CLUSTER_TABLE_SIZE_SUPPORT (0x0001 & MATTER_CLUSTER_TABLE_SIZE_SUPPORT_MASK)

// Use this macro to check if the server side of the Color Control cluster is included
#define ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER
#define MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER
Expand Down

0 comments on commit bfa3e6f

Please sign in to comment.