Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bridged Device Basic Information cluster #14768

Merged
merged 20 commits into from
Feb 18, 2022
Merged

Bridged Device Basic Information cluster #14768

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cb9c152
Update Bridged Basic XML and ZAP
lzgrablic02 Feb 3, 2022
66cf70d
Merge branch 'master' into bridged-basic
lzgrablic02 Feb 3, 2022
70f027e
Add Bridged Basic cluster back to tv-casting-app
lzgrablic02 Feb 3, 2022
2700460
ZAP regen
lzgrablic02 Feb 3, 2022
9b1bf70
Bridged Device Basic Information cluster server
lzgrablic02 Feb 4, 2022
84e97d2
Merge branch 'master' into bridged-basic
lzgrablic02 Feb 4, 2022
01bd980
Rename Bridged Basic files
lzgrablic02 Feb 4, 2022
5a1cd2e
Bridged Basic server typos and helper list fix
lzgrablic02 Feb 4, 2022
d84b871
ZAP regen
lzgrablic02 Feb 4, 2022
f3d440d
ZAP regen
lzgrablic02 Feb 4, 2022
632464e
Removed duplicate Bridged Basic init callback
lzgrablic02 Feb 4, 2022
eebee48
Remove Bridged Basic from all-cluster-app ZAP
lzgrablic02 Feb 7, 2022
949ff34
Revert "Add Bridged Basic cluster back to tv-casting-app"
lzgrablic02 Feb 7, 2022
aea1fbf
Remove generic platform Bridged Basic attr support
lzgrablic02 Feb 7, 2022
9b29c2b
Remove Bridged Basic from init helper list
lzgrablic02 Feb 7, 2022
eb94307
Revert "Removed duplicate Bridged Basic init callback"
lzgrablic02 Feb 7, 2022
9c14bdd
Merge branch 'master' into bridged-basic
lzgrablic02 Feb 7, 2022
16ae5f2
ZAP regen
lzgrablic02 Feb 7, 2022
6c92cc4
Bridged Basic ReachableChanged event
lzgrablic02 Feb 7, 2022
4fe74c9
Merge branch 'master' into bridged-basic
lzgrablic02 Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ server cluster BridgedDeviceBasic = 57 {
}

readonly attribute char_string<32> vendorName = 1;
readonly attribute int16u vendorID = 2;
readonly attribute vendor_id vendorID = 2;
readonly attribute char_string<32> productName = 3;
attribute char_string<32> nodeLabel = 5;
readonly attribute int16u hardwareVersion = 7;
Expand Down
64 changes: 32 additions & 32 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9927,7 +9927,7 @@
"side": "client",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
Expand All @@ -9952,8 +9952,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -9967,8 +9967,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -9982,8 +9982,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -9997,8 +9997,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -10012,8 +10012,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
Expand All @@ -10027,8 +10027,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -10042,8 +10042,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
Expand All @@ -10057,8 +10057,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -10072,10 +10072,10 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": "20210614123456ZZ",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand All @@ -10087,8 +10087,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -10102,8 +10102,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -10117,8 +10117,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -10132,8 +10132,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand All @@ -10148,7 +10148,7 @@
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
Expand All @@ -10162,8 +10162,8 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
Expand Down Expand Up @@ -10193,7 +10193,7 @@
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-app/esp32/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ set(SRC_DIRS_LIST
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-diagnostics-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/basic"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bridged-device-basic-information-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bindings"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/mbed/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ target_sources(${APP_TARGET} PRIVATE
${APP_CLUSTERS}/basic/basic.cpp
${APP_CLUSTERS}/bindings/BindingManager.cpp
${APP_CLUSTERS}/bindings/bindings.cpp
${APP_CLUSTERS}/bridged-device-basic-information-server/bridged-device-basic-information-server.cpp
${APP_CLUSTERS}/on-off-server/on-off-server.cpp
${APP_CLUSTERS}/access-control-server/access-control-server.cpp
${APP_CLUSTERS}/account-login-server/account-login-server.cpp
${APP_CLUSTERS}/application-launcher-server/application-launcher-server.cpp
${APP_CLUSTERS}/audio-output-server/audio-output-server.cpp
${APP_CLUSTERS}/barrier-control-server/barrier-control-server.cpp
${APP_CLUSTERS}/basic/basic.cpp
lzgrablic02 marked this conversation as resolved.
Show resolved Hide resolved
${APP_CLUSTERS}/bindings/bindings.cpp
${APP_CLUSTERS}/color-control-server/color-control-server.cpp
${APP_CLUSTERS}/content-launch-server/content-launch-server.cpp
Expand Down
1 change: 1 addition & 0 deletions examples/bridge-app/esp32/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/access-control-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/administrator-commissioning-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/basic"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bridged-device-basic-information-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/level-control"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
Expand Down
19 changes: 19 additions & 0 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,13 @@ client cluster Groups = 4 {
request struct ViewGroupRequest {
INT16U groupId = 0;
}

command AddGroup(AddGroupRequest): AddGroupResponse = 0;
command AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
command RemoveAllGroups(): DefaultSuccess = 4;
command RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
}

client cluster Identify = 3 {
Expand Down Expand Up @@ -1009,6 +1016,10 @@ client cluster OnOff = 6 {
readonly global attribute attrib_id attributeList[] = 65531;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

command Off(): DefaultSuccess = 0;
command On(): DefaultSuccess = 1;
command Toggle(): DefaultSuccess = 2;
}

server cluster OperationalCredentials = 62 {
Expand Down Expand Up @@ -1215,6 +1226,14 @@ client cluster Scenes = 5 {
CHAR_STRING sceneName = 4;
SceneExtensionFieldSet extensionFieldSets[] = 5;
}

command AddScene(AddSceneRequest): AddSceneResponse = 0;
command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
command RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
command RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
command StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
}

server cluster SoftwareDiagnostics = 52 {
Expand Down
26 changes: 0 additions & 26 deletions examples/light-switch-app/light-switch-common/light-switch-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6382,32 +6382,6 @@
}
]
},
{
"name": "Bridged Device Basic",
"code": 57,
"mfgCode": null,
"define": "BRIDGED_DEVICE_BASIC_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [],
"attributes": [
{
"name": "ProductURL",
"code": 13,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
]
},
{
"name": "Color Control",
"code": 768,
Expand Down
26 changes: 0 additions & 26 deletions examples/lighting-app/lighting-common/lighting-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6123,32 +6123,6 @@
}
]
},
{
"name": "Bridged Device Basic",
"code": 57,
"mfgCode": null,
"define": "BRIDGED_DEVICE_BASIC_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [],
"attributes": [
{
"name": "ProductURL",
"code": 13,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
]
},
{
"name": "Color Control",
"code": 768,
Expand Down
Loading