Skip to content

Commit 5ea5c2a

Browse files
stingchangrestyled-commits
stingchang
and
restyled-commits
authored
Add temperature control cluster impl for laundry washer (project-chip#36105)
* add temperature control cluster impl for laundry washer * add washer mode reader writer * remove extra import * fix style * Restyled by clang-format * update temperature level * string span; OnOff DF feature; * Restyled by clang-format * copyright year * static assert * Restyled by clang-format * return error * verify and return * Restyled by whitespace --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent f1457a2 commit 5ea5c2a

11 files changed

+644
-28
lines changed

‎examples/chef/common/chef-laundry-washer-controls-delegate-impl.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ const CharSpan LaundryWasherControlDelegate::spinSpeedsNameOptions[] = {
3030
};
3131

3232
const NumberOfRinsesEnum LaundryWasherControlDelegate::supportRinsesOptions[] = {
33+
NumberOfRinsesEnum::kNone,
3334
NumberOfRinsesEnum::kNormal,
3435
NumberOfRinsesEnum::kExtra,
36+
NumberOfRinsesEnum::kMax,
3537
};
3638

3739
LaundryWasherControlDelegate LaundryWasherControlDelegate::instance;

‎examples/chef/common/chef-laundry-washer-mode.cpp

+57
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ template <typename T>
2525
using List = chip::app::DataModel::List<T>;
2626
using ModeTagStructType = chip::app::Clusters::detail::Structs::ModeTagStruct::Type;
2727

28+
#ifdef MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER
2829
static LaundryWasherModeDelegate * gLaundryWasherModeDelegate = nullptr;
2930
static ModeBase::Instance * gLaundryWasherModeInstance = nullptr;
3031

@@ -94,6 +95,61 @@ void LaundryWasherMode::Shutdown()
9495
}
9596
}
9697

98+
chip::Protocols::InteractionModel::Status chefLaundryWasherModeWriteCallback(chip::EndpointId endpointId, chip::ClusterId clusterId,
99+
const EmberAfAttributeMetadata * attributeMetadata,
100+
uint8_t * buffer)
101+
{
102+
VerifyOrReturnError(endpointId == 1 || gLaundryWasherModeInstance != nullptr,
103+
chip::Protocols::InteractionModel::Status::Failure);
104+
105+
chip::Protocols::InteractionModel::Status ret;
106+
chip::AttributeId attributeId = attributeMetadata->attributeId;
107+
108+
switch (attributeId)
109+
{
110+
case chip::app::Clusters::LaundryWasherMode::Attributes::CurrentMode::Id: {
111+
uint8_t m = buffer[0];
112+
ret = gLaundryWasherModeInstance->UpdateCurrentMode(m);
113+
if (chip::Protocols::InteractionModel::Status::Success != ret)
114+
{
115+
ChipLogError(DeviceLayer, "Invalid Attribute Update status: %d", static_cast<int>(ret));
116+
}
117+
}
118+
break;
119+
default:
120+
ret = chip::Protocols::InteractionModel::Status::UnsupportedWrite;
121+
ChipLogError(DeviceLayer, "Unsupported Attribute ID: %d", static_cast<int>(attributeId));
122+
break;
123+
}
124+
125+
return ret;
126+
}
127+
128+
chip::Protocols::InteractionModel::Status chefLaundryWasherModeReadCallback(chip::EndpointId endpointId, chip::ClusterId clusterId,
129+
const EmberAfAttributeMetadata * attributeMetadata,
130+
uint8_t * buffer, uint16_t maxReadLength)
131+
{
132+
VerifyOrReturnValue(maxReadLength > 0, chip::Protocols::InteractionModel::Status::ResourceExhausted);
133+
134+
chip::Protocols::InteractionModel::Status ret = chip::Protocols::InteractionModel::Status::Success;
135+
chip::AttributeId attributeId = attributeMetadata->attributeId;
136+
137+
switch (attributeId)
138+
{
139+
case chip::app::Clusters::LaundryWasherMode::Attributes::CurrentMode::Id: {
140+
*buffer = gLaundryWasherModeInstance->GetCurrentMode();
141+
ChipLogDetail(DeviceLayer, "Reading LaundryWasherMode CurrentMode : %d", static_cast<int>(attributeId));
142+
}
143+
break;
144+
default:
145+
ret = chip::Protocols::InteractionModel::Status::UnsupportedRead;
146+
ChipLogDetail(DeviceLayer, "Unsupported attributeId %d from reading RvcCleanMode", static_cast<int>(attributeId));
147+
break;
148+
}
149+
150+
return ret;
151+
}
152+
97153
void emberAfLaundryWasherModeClusterInitCallback(chip::EndpointId endpointId)
98154
{
99155
VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
@@ -103,3 +159,4 @@ void emberAfLaundryWasherModeClusterInitCallback(chip::EndpointId endpointId)
103159
new ModeBase::Instance(gLaundryWasherModeDelegate, 0x1, LaundryWasherMode::Id, chip::to_underlying(Feature::kOnOff));
104160
gLaundryWasherModeInstance->Init();
105161
}
162+
#endif // MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER

‎examples/chef/common/chef-laundry-washer-mode.h

+9
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,12 @@ void Shutdown();
8282
} // namespace Clusters
8383
} // namespace app
8484
} // namespace chip
85+
86+
#ifdef MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER
87+
chip::Protocols::InteractionModel::Status chefLaundryWasherModeWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
88+
const EmberAfAttributeMetadata * attributeMetadata,
89+
uint8_t * buffer);
90+
chip::Protocols::InteractionModel::Status chefLaundryWasherModeReadCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
91+
const EmberAfAttributeMetadata * attributeMetadata,
92+
uint8_t * buffer, uint16_t maxReadLength);
93+
#endif // MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER

‎examples/chef/common/clusters/temperature-control/static-supported-temperature-levels.cpp

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
/*
2+
*
3+
* Copyright (c) 2024 Project CHIP Authors
4+
* All rights reserved.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
#include <app/util/config.h>
20+
21+
#ifdef MATTER_DM_PLUGIN_TEMPERATURE_CONTROL_SERVER
22+
#include "static-supported-temperature-levels.h"
23+
#include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
24+
25+
using namespace chip;
26+
using namespace chip::app::Clusters;
27+
using namespace chip::app::Clusters::TemperatureControl;
28+
using chip::Protocols::InteractionModel::Status;
29+
30+
app::Clusters::TemperatureControl::AppSupportedTemperatureLevelsDelegate sAppSupportedTemperatureLevelsDelegate;
31+
32+
CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { "Low"_span, "Medium"_span, "High"_span };
33+
34+
const AppSupportedTemperatureLevelsDelegate::EndpointPair AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints
35+
[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = { EndpointPair(
36+
1 /* endpointId */, AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions,
37+
ArraySize(AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions)) };
38+
39+
uint8_t AppSupportedTemperatureLevelsDelegate::Size()
40+
{
41+
for (auto & endpointPair : AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints)
42+
{
43+
if (endpointPair.mEndpointId == mEndpoint)
44+
{
45+
return endpointPair.mSize;
46+
}
47+
}
48+
return 0;
49+
}
50+
51+
CHIP_ERROR AppSupportedTemperatureLevelsDelegate::Next(MutableCharSpan & item)
52+
{
53+
for (auto & endpointPair : AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints)
54+
{
55+
if (endpointPair.mEndpointId == mEndpoint)
56+
{
57+
if (endpointPair.mSize > mIndex)
58+
{
59+
CHIP_ERROR err = CopyCharSpanToMutableCharSpan(endpointPair.mTemperatureLevels[mIndex], item);
60+
if (err != CHIP_NO_ERROR)
61+
{
62+
ChipLogError(Zcl, "Error copying char span to mutable char span %s", ErrorStr(err));
63+
return err;
64+
}
65+
mIndex++;
66+
return CHIP_NO_ERROR;
67+
}
68+
}
69+
}
70+
return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
71+
}
72+
void emberAfTemperatureControlClusterInitCallback(EndpointId endpoint)
73+
{
74+
static_assert(MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT == 1, "This cluster is only enabled for endpoint 1");
75+
76+
chip::app::Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);
77+
}
78+
#endif // MATTER_DM_PLUGIN_TEMPERATURE_CONTROL_SERVER

‎examples/chef/common/clusters/temperature-control/static-supported-temperature-levels.h

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
*
3+
* Copyright (c) 2024 Project CHIP Authors
4+
* All rights reserved.
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
#pragma once
20+
21+
#include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
22+
#include <app/util/config.h>
23+
24+
namespace chip {
25+
namespace app {
26+
namespace Clusters {
27+
namespace TemperatureControl {
28+
29+
class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsIteratorDelegate
30+
{
31+
struct EndpointPair
32+
{
33+
EndpointId mEndpointId;
34+
CharSpan * mTemperatureLevels;
35+
uint8_t mSize;
36+
37+
EndpointPair(EndpointId aEndpointId, CharSpan * TemperatureLevels, uint8_t size) :
38+
mEndpointId(aEndpointId), mTemperatureLevels(TemperatureLevels), mSize(size)
39+
{}
40+
};
41+
42+
static CharSpan temperatureLevelOptions[3];
43+
static const EndpointPair supportedOptionsByEndpoints[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT];
44+
45+
public:
46+
uint8_t Size() override;
47+
48+
CHIP_ERROR Next(MutableCharSpan & item) override;
49+
50+
~AppSupportedTemperatureLevelsDelegate() {}
51+
};
52+
53+
} // namespace TemperatureControl
54+
} // namespace Clusters
55+
} // namespace app
56+
} // namespace chip

‎examples/chef/common/stubs.cpp

+20
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,22 @@ const Clusters::Descriptor::Structs::SemanticTagStruct::Type freezerTagList[]
6262
#include "chef-dishwasher-mode-delegate-impl.h"
6363
#endif // MATTER_DM_PLUGIN_DISHWASHER_MODE_SERVER
6464

65+
#ifdef MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER
66+
#include "chef-laundry-washer-mode.h"
67+
#endif // MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER
68+
69+
#ifdef MATTER_DM_PLUGIN_LAUNDRY_WASHER_CONTROLS_SERVER
70+
#include "chef-laundry-washer-controls-delegate-impl.h"
71+
#endif // MATTER_DM_PLUGIN_LAUNDRY_WASHER_CONTROLS_SERVER
72+
6573
#ifdef MATTER_DM_PLUGIN_OPERATIONAL_STATE_SERVER
6674
#include "chef-operational-state-delegate-impl.h"
6775
#endif // MATTER_DM_PLUGIN_OPERATIONAL_STATE_SERVER
6876

77+
#ifdef MATTER_DM_PLUGIN_TEMPERATURE_CONTROL_SERVER
78+
#include "temperature-control/static-supported-temperature-levels.h"
79+
#endif // MATTER_DM_PLUGIN_TEMPERATURE_CONTROL_SERVER
80+
6981
Protocols::InteractionModel::Status emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId,
7082
const EmberAfAttributeMetadata * attributeMetadata,
7183
uint8_t * buffer, uint16_t maxReadLength)
@@ -124,6 +136,10 @@ Protocols::InteractionModel::Status emberAfExternalAttributeReadCallback(Endpoin
124136
case chip::app::Clusters::DishwasherMode::Id:
125137
return chefDishwasherModeReadCallback(endpoint, clusterId, attributeMetadata, buffer, maxReadLength);
126138
#endif // MATTER_DM_PLUGIN_DISHWASHER_MODE_SERVER
139+
#ifdef MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER
140+
case chip::app::Clusters::LaundryWasherMode::Id:
141+
return chefLaundryWasherModeReadCallback(endpoint, clusterId, attributeMetadata, buffer, maxReadLength);
142+
#endif // MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER
127143
#ifdef MATTER_DM_PLUGIN_OPERATIONAL_STATE_SERVER
128144
case chip::app::Clusters::OperationalState::Id:
129145
return chefOperationalStateReadCallback(endpoint, clusterId, attributeMetadata, buffer, maxReadLength);
@@ -202,6 +218,10 @@ Protocols::InteractionModel::Status emberAfExternalAttributeWriteCallback(Endpoi
202218
case chip::app::Clusters::DishwasherMode::Id:
203219
return chefDishwasherModeWriteCallback(endpoint, clusterId, attributeMetadata, buffer);
204220
#endif // MATTER_DM_PLUGIN_DISHWASHER_MODE_SERVER
221+
#ifdef MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER
222+
case chip::app::Clusters::LaundryWasherMode::Id:
223+
return chefLaundryWasherModeWriteCallback(endpoint, clusterId, attributeMetadata, buffer);
224+
#endif // MATTER_DM_PLUGIN_LAUNDRY_WASHER_MODE_SERVER
205225
#ifdef MATTER_DM_PLUGIN_OPERATIONAL_STATE_SERVER
206226
case chip::app::Clusters::OperationalState::Id:
207227
return chefOperationalStateWriteCallback(endpoint, clusterId, attributeMetadata, buffer);

0 commit comments

Comments
 (0)