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

[Scenes] Removal of Optional for AttributeId #27509

Merged
merged 2 commits into from
Jun 28, 2023
Merged

[Scenes] Removal of Optional for AttributeId #27509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42df331
Removed the optionnal quality from the AttributeId in scene xml and r…
lpbeliveau-silabs Jun 27, 2023
d8ef748
Update src/app/tests/TestSceneTable.cpp
andy31415 Jun 28, 2023
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 @@ -159,7 +159,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -207,7 +207,7 @@ client cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/data_model/lighting-thread-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/thermostat-common/thermostat.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/common/window-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ server cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
10 changes: 3 additions & 7 deletions src/app/clusters/on-off-server/on-off-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl

AttributeValuePair pairs[scenableAttributeCount];

pairs[0].attributeID.SetValue(Attributes::OnOff::Id);
pairs[0].attributeID = Attributes::OnOff::Id;
pairs[0].attributeValue = currentValue;

app::DataModel::List<AttributeValuePair> attributeValueList(pairs);
Expand Down Expand Up @@ -230,11 +230,7 @@ class DefaultOnOffSceneHandler : public scenes::DefaultSceneHandlerImpl
while (pair_iterator.Next())
{
auto & decodePair = pair_iterator.GetValue();
if (decodePair.attributeID.HasValue())
{
// If attribute ID was encoded, verify it is the proper ID for the OnOff attribute
VerifyOrReturnError(decodePair.attributeID.Value() == Attributes::OnOff::Id, CHIP_ERROR_INVALID_ARGUMENT);
}
VerifyOrReturnError(decodePair.attributeID == Attributes::OnOff::Id, CHIP_ERROR_INVALID_ARGUMENT);
ReturnErrorOnFailure(
mSceneEndpointStatePairs.InsertPair(EndpointStatePair(endpoint, static_cast<bool>(decodePair.attributeValue))));
}
Expand Down Expand Up @@ -545,7 +541,7 @@ void OnOffServer::initOnOffServer(chip::EndpointId endpoint)

#ifdef EMBER_AF_PLUGIN_SCENES
// Registers Scene handlers for the On/Off cluster on the server
// app::Clusters::Scenes::ScenesServer::Instance().RegisterSceneHandler(OnOffServer::Instance().GetSceneHandler());
app::Clusters::Scenes::ScenesServer::Instance().RegisterSceneHandler(OnOffServer::Instance().GetSceneHandler());
#endif

#ifdef EMBER_AF_PLUGIN_MODE_SELECT
Expand Down
26 changes: 13 additions & 13 deletions src/app/tests/TestSceneTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,29 +494,29 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
static const uint16_t LC_av_payload[2] = { 0x64, 0x01F0 };
static const uint16_t CC_av_payload[8] = { 0 };

OOPairs[0].attributeID.SetValue(kOnOffAttId);
OOPairs[0].attributeID = kOnOffAttId;
OOPairs[0].attributeValue = OO_av_payload;

LCPairs[0].attributeID.SetValue(kCurrentLevelId);
LCPairs[0].attributeID = kCurrentLevelId;
LCPairs[0].attributeValue = LC_av_payload[0];
LCPairs[1].attributeID.SetValue(kCurrentFrequencyId);
LCPairs[1].attributeID = kCurrentFrequencyId;
LCPairs[1].attributeValue = LC_av_payload[1];

CCPairs[0].attributeID.SetValue(kCurrentSaturationId);
CCPairs[0].attributeID = kCurrentSaturationId;
CCPairs[0].attributeValue = CC_av_payload[0];
CCPairs[1].attributeID.SetValue(kCurrentXId);
CCPairs[1].attributeID = kCurrentXId;
CCPairs[1].attributeValue = CC_av_payload[1];
CCPairs[2].attributeID.SetValue(kCurrentYId);
CCPairs[2].attributeID = kCurrentYId;
CCPairs[2].attributeValue = CC_av_payload[2];
CCPairs[3].attributeID.SetValue(kColorTemperatureMiredsId);
CCPairs[3].attributeID = kColorTemperatureMiredsId;
CCPairs[3].attributeValue = CC_av_payload[3];
CCPairs[4].attributeID.SetValue(kEnhancedCurrentHueId);
CCPairs[4].attributeID = kEnhancedCurrentHueId;
CCPairs[4].attributeValue = CC_av_payload[4];
CCPairs[5].attributeID.SetValue(kColorLoopActiveId);
CCPairs[5].attributeID = kColorLoopActiveId;
CCPairs[5].attributeValue = CC_av_payload[5];
CCPairs[6].attributeID.SetValue(kColorLoopDirectionId);
CCPairs[6].attributeID = kColorLoopDirectionId;
CCPairs[6].attributeValue = CC_av_payload[6];
CCPairs[7].attributeID.SetValue(kColorLoopTimeId);
CCPairs[7].attributeID = kColorLoopTimeId;
CCPairs[7].attributeValue = CC_av_payload[7];

// Initialize Extension Field sets as if they were received by add commands
Expand Down Expand Up @@ -637,7 +637,6 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
app::Clusters::Scenes::Structs::AttributeValuePair::Type TooManyPairs[16];

uint8_t payloadOk = 0;

for (uint8_t i = 0; i < 16; i++)
{
TooManyPairs[i].attributeValue = payloadOk;
Expand All @@ -646,7 +645,8 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
extensionFieldFailTestOut.clusterID = kColorControlClusterId;
extensionFieldFailTestOut.attributeValueList = TooManyPairs;

uint8_t failBuffer[scenes::kMaxFieldBytesPerCluster] = { 0 };
// Give a bigger buffer given we are using too many pairs on purpose
uint8_t failBuffer[2 * scenes::kMaxFieldBytesPerCluster] = { 0 };
ByteSpan fail_list(failBuffer);

// Serialize Extension Field sets as if they were recovered from memory
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/scene.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ limitations under the License.

<struct name="AttributeValuePair">
<cluster code="0x0005"/>
<item name="AttributeID" type="attrib_id" optional="true"/>
<item name="AttributeID" type="attrib_id" optional="false"/>
<item name="AttributeValue" type="INT32U" optional="false"/>
</struct>

Expand Down
2 changes: 1 addition & 1 deletion src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ client cluster Scenes = 5 {
}

struct AttributeValuePair {
optional attrib_id attributeID = 0;
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

Expand Down
46 changes: 12 additions & 34 deletions src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 2 additions & 8 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 2 additions & 8 deletions src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading