-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Changes to support the bridge test plan. Added single character commands to the bridge-app to support the bridge test plan. The following commands are supported: 2 (TC-BR-2) Light 2 is added 4 (TC-BR-4) Light 1 is removed 5 (TC-BR-5) Light 1 is added back b (TC-BR-3 step 1b) Present devices are renamed c (TC-BR-3 step 2c) State of Light 1 and Light 2 are changed. Z * Progress for aggregator changes. * Changed the example/bridge app have the bridge on a non-zero endpoint ID. The example/bridge-app was updated to use a non-zero endpoint-ID. The bridge/aggregator is now on endpoint 1. All endpoint IDs show on both endpoint ID 0, and the dynamic deivces added to the bridge show on the bridge endpoint ID 1 as well. * Removed fixed label from bridge-app example. The funcion of the fixed label is replaced by the actions cluster, so the fixed label was removed. * Update examples/bridge-app/linux/bridged-actions-stub.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Added Restyled changes. * Resolved build failures for bridge-app - removed fixed label support from esp32 bridge-app - added include for identify-server.h - added callbacks for bridged-actions * Fixed restyled whitespace. Co-authored-by: Boris Zbarsky <[email protected]>
- Loading branch information
1 parent
b16ddb3
commit 3522f9a
Showing
18 changed files
with
2,884 additions
and
469 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
2,087 changes: 1,899 additions & 188 deletions
2,087
examples/bridge-app/bridge-common/bridge-app.zap
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| * | ||
| * Copyright (c) 2021 Project CHIP Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include <app-common/zap-generated/af-structs.h> | ||
| #include <app-common/zap-generated/cluster-objects.h> | ||
| #include <app-common/zap-generated/ids/Attributes.h> | ||
| #include <app-common/zap-generated/ids/Clusters.h> | ||
| #include <app/AttributeAccessInterface.h> | ||
| #include <app/util/attribute-storage.h> | ||
| #include <lib/support/CodeUtils.h> | ||
| #include <lib/support/logging/CHIPLogging.h> | ||
|
|
||
| using namespace chip; | ||
| using namespace chip::app; | ||
| using namespace chip::app::Clusters; | ||
| using namespace chip::app::Clusters::BridgedActions::Attributes; | ||
|
|
||
| namespace { | ||
|
|
||
| class BridgedActionsAttrAccess : public AttributeAccessInterface | ||
| { | ||
| public: | ||
| // Register for the Bridged Actions cluster on all endpoints. | ||
| BridgedActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), BridgedActions::Id) {} | ||
|
|
||
| CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override; | ||
|
|
||
| private: | ||
| static constexpr uint16_t ClusterRevision = 1; | ||
|
|
||
| CHIP_ERROR ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder); | ||
| CHIP_ERROR ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder); | ||
| CHIP_ERROR ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder); | ||
| CHIP_ERROR ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder); | ||
| }; | ||
|
|
||
| constexpr uint16_t BridgedActionsAttrAccess::ClusterRevision; | ||
|
|
||
| CHIP_ERROR BridgedActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder) | ||
| { | ||
| // Just return an empty list | ||
| return aEncoder.EncodeEmptyList(); | ||
| } | ||
|
|
||
| CHIP_ERROR BridgedActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder) | ||
| { | ||
| // Just return an empty list | ||
| return aEncoder.EncodeEmptyList(); | ||
| } | ||
|
|
||
| CHIP_ERROR BridgedActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder) | ||
| { | ||
| const char SetupUrl[] = "https://example.com"; | ||
| return aEncoder.Encode(chip::CharSpan::fromCharString(SetupUrl)); | ||
| } | ||
|
|
||
| CHIP_ERROR BridgedActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder) | ||
| { | ||
| return aEncoder.Encode(ClusterRevision); | ||
| } | ||
|
|
||
| BridgedActionsAttrAccess gAttrAccess; | ||
|
|
||
| CHIP_ERROR BridgedActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) | ||
| { | ||
| VerifyOrDie(aPath.mClusterId == BridgedActions::Id); | ||
|
|
||
| switch (aPath.mAttributeId) | ||
| { | ||
| case ActionList::Id: | ||
| return ReadActionListAttribute(aPath.mEndpointId, aEncoder); | ||
| case EndpointList::Id: | ||
| return ReadEndpointListAttribute(aPath.mEndpointId, aEncoder); | ||
| case SetupUrl::Id: | ||
| return ReadSetupUrlAttribute(aPath.mEndpointId, aEncoder); | ||
| case ClusterRevision::Id: | ||
| return ReadClusterRevision(aPath.mEndpointId, aEncoder); | ||
| default: | ||
| break; | ||
| } | ||
| return CHIP_NO_ERROR; | ||
| } | ||
| } // anonymous namespace | ||
|
|
||
| void MatterBridgedActionsPluginServerInitCallback(void) | ||
| { | ||
| registerAttributeAccessOverride(&gAttrAccess); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.