From 3782241a79978f0e000427711de70f9db164695a Mon Sep 17 00:00:00 2001 From: C Freeman Date: Fri, 21 Jul 2023 20:23:59 -0400 Subject: [PATCH] Power source: Update bridge app (#28134) * Power source: Update bridge app - move power cluster to composed endpoint base - add power source device type to composed endpoint base - add endpoint list to power source cluster - update revision of power source cluster - Use AttributeAccess interface (allows list handling) - Add required attributes NOTE: The events list is still not correct, so the bridge app does not pass the 1.1 test Tests: Attributes ok on 1.1, 2.1 ok * Include all the endpoints for the composed device * Address comments from review. Test: Read EndpointList attribute from correct and incorrect cluster TC_PS_1_1, TC_PS_2_1 (1.1 fails, but not on attributes) also tried with empty endpoint list - OK * Update examples/bridge-app/linux/main.cpp Co-authored-by: Boris Zbarsky * Update examples/bridge-app/linux/main.cpp Co-authored-by: Boris Zbarsky --------- Co-authored-by: Boris Zbarsky --- examples/bridge-app/linux/Device.cpp | 11 ++ examples/bridge-app/linux/include/Device.h | 9 +- examples/bridge-app/linux/main.cpp | 168 ++++++++++++--------- 3 files changed, 112 insertions(+), 76 deletions(-) diff --git a/examples/bridge-app/linux/Device.cpp b/examples/bridge-app/linux/Device.cpp index 53959cc5f919c0..e049e270c49f42 100644 --- a/examples/bridge-app/linux/Device.cpp +++ b/examples/bridge-app/linux/Device.cpp @@ -275,6 +275,17 @@ void DevicePowerSource::SetDescription(std::string aDescription) } } +void DevicePowerSource::SetEndpointList(std::vector aEndpointList) +{ + bool changed = aEndpointList != mEndpointList; + mEndpointList = aEndpointList; + + if (changed && mChanged_CB) + { + mChanged_CB(this, kChanged_EndpointList); + } +} + EndpointListInfo::EndpointListInfo(uint16_t endpointListId, std::string name, EndpointListTypeEnum type) { mEndpointListId = endpointListId; diff --git a/examples/bridge-app/linux/include/Device.h b/examples/bridge-app/linux/include/Device.h index 2b1c110c1b1ab3..d5c8434b29eda1 100644 --- a/examples/bridge-app/linux/include/Device.h +++ b/examples/bridge-app/linux/include/Device.h @@ -175,8 +175,9 @@ class DevicePowerSource : public Device public: enum Changed_t { - kChanged_BatLevel = kChanged_Last << 1, - kChanged_Description = kChanged_Last << 2, + kChanged_BatLevel = kChanged_Last << 1, + kChanged_Description = kChanged_Last << 2, + kChanged_EndpointList = kChanged_Last << 3, } Changed; DevicePowerSource(const char * szDeviceName, std::string szLocation, @@ -189,12 +190,14 @@ class DevicePowerSource : public Device void SetBatChargeLevel(uint8_t aBatChargeLevel); void SetDescription(std::string aDescription); + void SetEndpointList(std::vector mEndpointList); inline uint32_t GetFeatureMap() { return mFeatureMap.Raw(); }; inline uint8_t GetBatChargeLevel() { return mBatChargeLevel; }; inline uint8_t GetOrder() { return mOrder; }; inline uint8_t GetStatus() { return mStatus; }; inline std::string GetDescription() { return mDescription; }; + std::vector & GetEndpointList() { return mEndpointList; } private: void HandleDeviceChange(Device * device, Device::Changed_t changeMask); @@ -206,6 +209,8 @@ class DevicePowerSource : public Device std::string mDescription = "Primary Battery"; chip::BitFlags mFeatureMap; DeviceCallback_fn mChanged_CB; + // This is linux, vector is not going to kill us here and it's easier. Plus, post c++11, storage is contiguous with .data() + std::vector mEndpointList; }; class EndpointListInfo diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index d460836e8ca4f7..382ff7fe456de0 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -66,7 +66,8 @@ const int kDescriptorAttributeArraySize = 254; EndpointId gCurrentEndpointId; EndpointId gFirstDynamicEndpointId; -Device * gDevices[CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT]; +// Power source is on the same endpoint as the composed device +Device * gDevices[CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT + 1]; std::vector gRooms; std::vector gActions; @@ -180,26 +181,6 @@ Action action2(0x1002, "Turn On Room 2", Actions::ActionTypeEnum::kAutomation, 0 Action action3(0x1003, "Turn Off Room 1", Actions::ActionTypeEnum::kAutomation, 0xE003, 0x01, Actions::ActionStateEnum::kInactive, false); -// --------------------------------------------------------------------------- -// -// POWER SOURCE ENDPOINT: contains the following clusters: -// - Power Source -// - Descriptor -// - Bridged Device Basic Information - -DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(powerSourceAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::BatChargeLevel::Id, ENUM8, 1, 0), - DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Order::Id, INT8U, 1, 0), - DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Status::Id, ENUM8, 1, 0), - DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Description::Id, CHAR_STRING, 32, 0), DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); - -DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedPowerSourceClusters) -DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), - DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasicInformation::Id, bridgedDeviceBasicAttrs, nullptr, nullptr), - DECLARE_DYNAMIC_CLUSTER(PowerSource::Id, powerSourceAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER_LIST_END; - -DECLARE_DYNAMIC_ENDPOINT(bridgedPowerSourceEndpoint, bridgedPowerSourceClusters); - DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(tempSensorAttrs) DECLARE_DYNAMIC_ATTRIBUTE(TemperatureMeasurement::Attributes::MeasuredValue::Id, INT16S, 2, 0), /* Measured Value */ DECLARE_DYNAMIC_ATTRIBUTE(TemperatureMeasurement::Attributes::MinMeasuredValue::Id, INT16S, 2, 0), /* Min Measured Value */ @@ -229,18 +210,28 @@ DataVersion gTempSensor2DataVersions[ArraySize(bridgedTempSensorClusters)]; // COMPOSED DEVICE ENDPOINT: contains the following clusters: // - Descriptor // - Bridged Device Basic Information +// - Power source // Composed Device Configuration +DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(powerSourceAttrs) +DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::BatChargeLevel::Id, ENUM8, 1, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::BatReplacementNeeded::Id, BOOLEAN, 1, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::BatReplaceability::Id, ENUM8, 1, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Order::Id, INT8U, 1, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Status::Id, ENUM8, 1, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Description::Id, CHAR_STRING, 32, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::EndpointList::Id, ARRAY, 0, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::FeatureMap::Id, BITMAP32, 4, 0), DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); + DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedComposedDeviceClusters) DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER(BridgedDeviceBasicInformation::Id, bridgedDeviceBasicAttrs, nullptr, nullptr), - DECLARE_DYNAMIC_CLUSTER_LIST_END; + DECLARE_DYNAMIC_CLUSTER(PowerSource::Id, powerSourceAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER_LIST_END; DECLARE_DYNAMIC_ENDPOINT(bridgedComposedDeviceEndpoint, bridgedComposedDeviceClusters); DataVersion gComposedDeviceDataVersions[ArraySize(bridgedComposedDeviceClusters)]; DataVersion gComposedTempSensor1DataVersions[ArraySize(bridgedTempSensorClusters)]; DataVersion gComposedTempSensor2DataVersions[ArraySize(bridgedTempSensorClusters)]; -DataVersion gComposedPowerSourceDataVersions[ArraySize(bridgedPowerSourceClusters)]; } // namespace @@ -254,7 +245,7 @@ DataVersion gComposedPowerSourceDataVersions[ArraySize(bridgedPowerSourceCluster #define ZCL_ON_OFF_CLUSTER_REVISION (4u) #define ZCL_TEMPERATURE_SENSOR_CLUSTER_REVISION (1u) #define ZCL_TEMPERATURE_SENSOR_FEATURE_MAP (0u) -#define ZCL_POWER_SOURCE_CLUSTER_REVISION (1u) +#define ZCL_POWER_SOURCE_CLUSTER_REVISION (2u) // --------------------------------------------------------------------------- @@ -425,6 +416,10 @@ void HandleDevicePowerSourceStatusChanged(DevicePowerSource * dev, DevicePowerSo { MatterReportingAttributeChangeCallback(dev->GetEndpointId(), PowerSource::Id, PowerSource::Attributes::Description::Id); } + if (itemChangedMask & DevicePowerSource::kChanged_EndpointList) + { + MatterReportingAttributeChangeCallback(dev->GetEndpointId(), PowerSource::Id, PowerSource::Attributes::EndpointList::Id); + } } void HandleDeviceTempSensorStatusChanged(DeviceTempSensor * dev, DeviceTempSensor::Changed_t itemChangedMask) @@ -518,45 +513,6 @@ EmberAfStatus HandleWriteOnOffAttribute(DeviceOnOff * dev, chip::AttributeId att return EMBER_ZCL_STATUS_SUCCESS; } -EmberAfStatus HandleReadPowerSourceAttribute(DevicePowerSource * dev, chip::AttributeId attributeId, uint8_t * buffer, - uint16_t maxReadLength) -{ - using namespace app::Clusters; - if ((attributeId == PowerSource::Attributes::BatChargeLevel::Id) && (maxReadLength == 1)) - { - *buffer = dev->GetBatChargeLevel(); - } - else if ((attributeId == PowerSource::Attributes::Order::Id) && (maxReadLength == 1)) - { - *buffer = dev->GetOrder(); - } - else if ((attributeId == PowerSource::Attributes::Status::Id) && (maxReadLength == 1)) - { - *buffer = dev->GetStatus(); - } - else if ((attributeId == PowerSource::Attributes::Description::Id) && (maxReadLength == 32)) - { - MutableByteSpan zclDescpitionSpan(buffer, maxReadLength); - MakeZclCharString(zclDescpitionSpan, dev->GetDescription().c_str()); - } - else if ((attributeId == PowerSource::Attributes::ClusterRevision::Id) && (maxReadLength == 2)) - { - uint16_t rev = ZCL_POWER_SOURCE_CLUSTER_REVISION; - memcpy(buffer, &rev, sizeof(rev)); - } - else if ((attributeId == PowerSource::Attributes::FeatureMap::Id) && (maxReadLength == 4)) - { - uint32_t featureMap = dev->GetFeatureMap(); - memcpy(buffer, &featureMap, sizeof(featureMap)); - } - else - { - return EMBER_ZCL_STATUS_FAILURE; - } - - return EMBER_ZCL_STATUS_SUCCESS; -} - EmberAfStatus HandleReadTempMeasurementAttribute(DeviceTempSensor * dev, chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength) { @@ -615,11 +571,6 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI { ret = HandleReadOnOffAttribute(static_cast(dev), attributeMetadata->attributeId, buffer, maxReadLength); } - else if (clusterId == chip::app::Clusters::PowerSource::Id) - { - ret = HandleReadPowerSourceAttribute(static_cast(dev), attributeMetadata->attributeId, buffer, - maxReadLength); - } else if (clusterId == TemperatureMeasurement::Id) { ret = HandleReadTempMeasurementAttribute(static_cast(dev), attributeMetadata->attributeId, buffer, @@ -630,6 +581,67 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI return ret; } +class BridgedPowerSourceAttrAccess : public AttributeAccessInterface +{ +public: + // Register on all endpoints. + BridgedPowerSourceAttrAccess() : AttributeAccessInterface(Optional::Missing(), PowerSource::Id) {} + + CHIP_ERROR + Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override + { + uint16_t powerSourceDeviceIndex = CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + + if ((gDevices[powerSourceDeviceIndex] != nullptr)) + { + DevicePowerSource * dev = static_cast(gDevices[powerSourceDeviceIndex]); + if (aPath.mEndpointId != dev->GetEndpointId()) + { + return CHIP_IM_GLOBAL_STATUS(UnsupportedEndpoint); + } + switch (aPath.mAttributeId) + { + case PowerSource::Attributes::BatChargeLevel::Id: + aEncoder.Encode(dev->GetBatChargeLevel()); + break; + case PowerSource::Attributes::Order::Id: + aEncoder.Encode(dev->GetOrder()); + break; + case PowerSource::Attributes::Status::Id: + aEncoder.Encode(dev->GetStatus()); + break; + case PowerSource::Attributes::Description::Id: + aEncoder.Encode(chip::CharSpan(dev->GetDescription().c_str(), dev->GetDescription().size())); + break; + case PowerSource::Attributes::EndpointList::Id: { + std::vector & list = dev->GetEndpointList(); + DataModel::List dm_list(chip::Span(list.data(), list.size())); + aEncoder.Encode(dm_list); + break; + } + case PowerSource::Attributes::ClusterRevision::Id: + aEncoder.Encode(ZCL_POWER_SOURCE_CLUSTER_REVISION); + break; + case PowerSource::Attributes::FeatureMap::Id: + aEncoder.Encode(dev->GetFeatureMap()); + break; + + case PowerSource::Attributes::BatReplacementNeeded::Id: + aEncoder.Encode(false); + break; + case PowerSource::Attributes::BatReplaceability::Id: + aEncoder.Encode(PowerSource::BatReplaceabilityEnum::kNotReplaceable); + break; + default: + return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute); + } + } + return CHIP_NO_ERROR; + } +}; + +BridgedPowerSourceAttrAccess gPowerAttrAccess; + EmberAfStatus emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer) { @@ -732,12 +744,11 @@ void ApplicationInit() {} const EmberAfDeviceType gBridgedOnOffDeviceTypes[] = { { DEVICE_TYPE_LO_ON_OFF_LIGHT, DEVICE_VERSION_DEFAULT }, { DEVICE_TYPE_BRIDGED_NODE, DEVICE_VERSION_DEFAULT } }; -const EmberAfDeviceType gBridgedComposedDeviceTypes[] = { { DEVICE_TYPE_BRIDGED_NODE, DEVICE_VERSION_DEFAULT } }; +const EmberAfDeviceType gBridgedComposedDeviceTypes[] = { { DEVICE_TYPE_BRIDGED_NODE, DEVICE_VERSION_DEFAULT }, + { DEVICE_TYPE_POWER_SOURCE, DEVICE_VERSION_DEFAULT } }; const EmberAfDeviceType gComposedTempSensorDeviceTypes[] = { { DEVICE_TYPE_TEMP_SENSOR, DEVICE_VERSION_DEFAULT } }; -const EmberAfDeviceType gComposedPowerSourceDeviceTypes[] = { { DEVICE_TYPE_POWER_SOURCE, DEVICE_VERSION_DEFAULT } }; - const EmberAfDeviceType gBridgedTempSensorDeviceTypes[] = { { DEVICE_TYPE_TEMP_SENSOR, DEVICE_VERSION_DEFAULT }, { DEVICE_TYPE_BRIDGED_NODE, DEVICE_VERSION_DEFAULT } }; @@ -970,9 +981,6 @@ int main(int argc, char * argv[]) AddDeviceEndpoint(&ComposedTempSensor2, &bridgedTempSensorEndpoint, Span(gComposedTempSensorDeviceTypes), Span(gComposedTempSensor2DataVersions), ComposedDevice.GetEndpointId()); - AddDeviceEndpoint(&ComposedPowerSource, &bridgedPowerSourceEndpoint, - Span(gComposedPowerSourceDeviceTypes), - Span(gComposedPowerSourceDataVersions), ComposedDevice.GetEndpointId()); // Add 4 lights for the Action Clusters tests AddDeviceEndpoint(&ActionLight1, &bridgedLightEndpoint, Span(gBridgedOnOffDeviceTypes), @@ -983,6 +991,17 @@ int main(int argc, char * argv[]) Span(gActionLight3DataVersions), 1); AddDeviceEndpoint(&ActionLight4, &bridgedLightEndpoint, Span(gBridgedOnOffDeviceTypes), Span(gActionLight4DataVersions), 1); + + // Because the power source is on the same endpoint as the composed device, it needs to be explicitly added + gDevices[CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT] = &ComposedPowerSource; + // This provides power for the composed endpoint + std::vector endpointList; + endpointList.push_back(ComposedDevice.GetEndpointId()); + endpointList.push_back(ComposedTempSensor1.GetEndpointId()); + endpointList.push_back(ComposedTempSensor2.GetEndpointId()); + ComposedPowerSource.SetEndpointList(endpointList); + ComposedPowerSource.SetEndpointId(ComposedDevice.GetEndpointId()); + gRooms.push_back(&room1); gRooms.push_back(&room2); gRooms.push_back(&room3); @@ -1004,6 +1023,7 @@ int main(int argc, char * argv[]) // Run CHIP ApplicationInit(); + registerAttributeAccessOverride(&gPowerAttrAccess); chip::DeviceLayer::PlatformMgr().RunEventLoop(); return 0;