Skip to content

Commit 8a5a882

Browse files
restyled-commitslazarkov
restyled-commits
authored and
lazarkov
committed
Restyled by clang-format
1 parent d5d71d7 commit 8a5a882

File tree

6 files changed

+44
-52
lines changed

6 files changed

+44
-52
lines changed

‎examples/tv-app/android/include/messages/MessagesManager.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ using namespace std;
2121
using namespace chip::app;
2222
using namespace chip::app::Clusters::Messages;
2323

24-
2524
// Commands
26-
void MessagesManager::HandlePresentMessagesRequest(const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
27-
const chip::BitMask<MessageControlBitmap> & messageControl,
28-
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint16_t> & duration,
29-
const chip::CharSpan & messageText,
30-
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses)
25+
void MessagesManager::HandlePresentMessagesRequest(
26+
const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
27+
const chip::BitMask<MessageControlBitmap> & messageControl, const chip::app::DataModel::Nullable<uint32_t> & startTime,
28+
const chip::app::DataModel::Nullable<uint16_t> & duration, const chip::CharSpan & messageText,
29+
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses)
3130
{
3231
// TODO: Present Message
3332
}

‎examples/tv-app/android/include/messages/MessagesManager.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ class MessagesManager : public MessagesDelegate
2727
{
2828
public:
2929
// Commands
30-
void HandlePresentMessagesRequest(const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
31-
const chip::BitMask<MessageControlBitmap> & messageControl,
32-
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint16_t> & duration,
33-
const chip::CharSpan & messageText,
34-
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses) override;
30+
void HandlePresentMessagesRequest(
31+
const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
32+
const chip::BitMask<MessageControlBitmap> & messageControl, const chip::app::DataModel::Nullable<uint32_t> & startTime,
33+
const chip::app::DataModel::Nullable<uint16_t> & duration, const chip::CharSpan & messageText,
34+
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses) override;
3535
void HandleCancelMessagesRequest(const chip::app::DataModel::DecodableList<chip::ByteSpan> & messageIds) override;
3636

3737
// Attributes

‎examples/tv-app/tv-common/clusters/messages/MessagesManager.cpp

+10-12
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,24 @@ using namespace std;
2121
using namespace chip::app;
2222
using namespace chip::app::Clusters::Messages;
2323

24-
2524
// Commands
26-
void MessagesManager::HandlePresentMessagesRequest(const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
27-
const chip::BitMask<MessageControlBitmap> & messageControl,
28-
const chip::app::DataModel::Nullable<uint32_t> & startTime,
29-
const chip::app::DataModel::Nullable<uint16_t> & duration,
30-
const chip::CharSpan & messageText,
31-
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses)
25+
void MessagesManager::HandlePresentMessagesRequest(
26+
const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
27+
const chip::BitMask<MessageControlBitmap> & messageControl, const chip::app::DataModel::Nullable<uint32_t> & startTime,
28+
const chip::app::DataModel::Nullable<uint16_t> & duration, const chip::CharSpan & messageText,
29+
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses)
3230
{
3331
Message message;
3432
// TODO: Enable id
3533
// message.messageID = messageId;
36-
message.priority = priority;
34+
message.priority = priority;
3735
message.messageControl = messageControl;
38-
message.startTime = startTime;
39-
message.duration = duration;
36+
message.startTime = startTime;
37+
message.duration = duration;
4038
// TODO: Enable text
4139
// message.messageText = messageText;
42-
// TODO: Convert to Optional<chip::app::DataModel::List<const chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::Type>>
43-
// message.responses = responses;
40+
// TODO: Convert to Optional<chip::app::DataModel::List<const
41+
// chip::app::Clusters::Messages::Structs::MessageResponseOptionStruct::Type>> message.responses = responses;
4442

4543
mMessages.push_back(message);
4644
// Add your code to present Message

‎examples/tv-app/tv-common/clusters/messages/MessagesManager.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ class MessagesManager : public MessagesDelegate
3131
{
3232
public:
3333
// Commands
34-
void HandlePresentMessagesRequest(const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
35-
const chip::BitMask<MessageControlBitmap> & messageControl,
36-
const chip::app::DataModel::Nullable<uint32_t> & startTime, const chip::app::DataModel::Nullable<uint16_t> & duration,
37-
const chip::CharSpan & messageText,
38-
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses) override;
34+
void HandlePresentMessagesRequest(
35+
const chip::ByteSpan & messageId, const MessagePriorityEnum & priority,
36+
const chip::BitMask<MessageControlBitmap> & messageControl, const chip::app::DataModel::Nullable<uint32_t> & startTime,
37+
const chip::app::DataModel::Nullable<uint16_t> & duration, const chip::CharSpan & messageText,
38+
const chip::Optional<chip::app::DataModel::DecodableList<MessageResponseOption>> & responses) override;
3939
void HandleCancelMessagesRequest(const chip::app::DataModel::DecodableList<chip::ByteSpan> & messageIds) override;
4040

4141
// Attributes

‎src/app/clusters/messages-server/messages-delegate.h

+8-7
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,16 @@ class Delegate
3939
{
4040
public:
4141
// Commands
42-
virtual void HandlePresentMessagesRequest(const ByteSpan & messageId, const MessagePriorityEnum & priority,
43-
const chip::BitMask<MessageControlBitmap> & messageControl,
44-
const DataModel::Nullable<uint32_t> & startTime, const DataModel::Nullable<uint16_t> & duration,
45-
const CharSpan & messageText,
46-
const chip::Optional<DataModel::DecodableList<MessageResponseOption>> & responses) = 0;
47-
virtual void HandleCancelMessagesRequest(const DataModel::DecodableList<chip::ByteSpan> & messageIds) = 0;
42+
virtual void
43+
HandlePresentMessagesRequest(const ByteSpan & messageId, const MessagePriorityEnum & priority,
44+
const chip::BitMask<MessageControlBitmap> & messageControl,
45+
const DataModel::Nullable<uint32_t> & startTime, const DataModel::Nullable<uint16_t> & duration,
46+
const CharSpan & messageText,
47+
const chip::Optional<DataModel::DecodableList<MessageResponseOption>> & responses) = 0;
48+
virtual void HandleCancelMessagesRequest(const DataModel::DecodableList<chip::ByteSpan> & messageIds) = 0;
4849

4950
// Attributes
50-
virtual CHIP_ERROR HandleGetMessages(app::AttributeValueEncoder & aEncoder) = 0;
51+
virtual CHIP_ERROR HandleGetMessages(app::AttributeValueEncoder & aEncoder) = 0;
5152
virtual CHIP_ERROR HandleGetActiveMessageIds(app::AttributeValueEncoder & aEncoder) = 0;
5253

5354
// Global Attributes

‎src/app/clusters/messages-server/messages-server.cpp

+11-17
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ using namespace chip;
3939
using namespace chip::app;
4040
using namespace chip::app::Clusters;
4141
using namespace chip::app::Clusters::Messages;
42-
using chip::Protocols::InteractionModel::Status;
4342
using chip::app::LogEvent;
43+
using chip::Protocols::InteractionModel::Status;
4444

4545
static constexpr size_t kMessagesDelegateTableSize =
4646
EMBER_AF_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
@@ -57,8 +57,7 @@ Delegate * GetDelegate(EndpointId endpoint)
5757
{
5858
ChipLogProgress(Zcl, "MessagesCluster NOT returning delegate for endpoint:%u", endpoint);
5959

60-
uint16_t ep =
61-
emberAfGetClusterServerEndpointIndex(endpoint, Messages::Id, EMBER_AF_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT);
60+
uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Messages::Id, EMBER_AF_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT);
6261
return (ep >= kMessagesDelegateTableSize ? nullptr : gDelegateTable[ep]);
6362
}
6463

@@ -73,16 +72,14 @@ bool isDelegateNull(Delegate * delegate, EndpointId endpoint)
7372
}
7473
} // namespace
7574

76-
7775
namespace chip {
7876
namespace app {
7977
namespace Clusters {
8078
namespace Messages {
8179

8280
void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate)
8381
{
84-
uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Messages::Id,
85-
EMBER_AF_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT);
82+
uint16_t ep = emberAfGetClusterServerEndpointIndex(endpoint, Messages::Id, EMBER_AF_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT);
8683
// if endpoint is found
8784
if (ep < kMessagesDelegateTableSize)
8885
{
@@ -104,7 +101,6 @@ bool Delegate::HasFeature(chip::EndpointId endpoint, Feature feature)
104101
} // namespace app
105102
} // namespace chip
106103

107-
108104
// -----------------------------------------------------------------------------
109105
// Attribute Accessor Implementation
110106

@@ -164,7 +160,7 @@ CHIP_ERROR MessagesAttrAccess::Read(const app::ConcreteReadAttributePath & aPath
164160
}
165161

166162
CHIP_ERROR MessagesAttrAccess::ReadFeatureFlagAttribute(EndpointId endpoint, app::AttributeValueEncoder & aEncoder,
167-
Delegate * delegate)
163+
Delegate * delegate)
168164
{
169165
uint32_t featureFlag = delegate->GetFeatureMap(endpoint);
170166
return aEncoder.Encode(featureFlag);
@@ -182,7 +178,6 @@ CHIP_ERROR MessagesAttrAccess::ReadActiveMessageIds(app::AttributeValueEncoder &
182178

183179
} // anonymous namespace
184180

185-
186181
bool emberAfMessagesClusterPresentMessagesRequestCallback(
187182
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
188183
const chip::app::Clusters::Messages::Commands::PresentMessagesRequest::DecodableType & commandData)
@@ -191,19 +186,18 @@ bool emberAfMessagesClusterPresentMessagesRequestCallback(
191186
EndpointId endpoint = commandPath.mEndpointId;
192187
Status status = Status::Success;
193188

194-
auto & messageId = commandData.messageID;
195-
auto & priority = commandData.priority;
189+
auto & messageId = commandData.messageID;
190+
auto & priority = commandData.priority;
196191
auto & messageControl = commandData.messageControl;
197-
auto & startTime = commandData.startTime;
198-
auto & duration = commandData.duration;
199-
auto & messageText = commandData.messageText;
200-
auto & responses = commandData.responses;
192+
auto & startTime = commandData.startTime;
193+
auto & duration = commandData.duration;
194+
auto & messageText = commandData.messageText;
195+
auto & responses = commandData.responses;
201196

202197
Delegate * delegate = GetDelegate(endpoint);
203198
VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE);
204199
{
205-
delegate->HandlePresentMessagesRequest(messageId, priority, messageControl, startTime,
206-
duration, messageText, responses);
200+
delegate->HandlePresentMessagesRequest(messageId, priority, messageControl, startTime, duration, messageText, responses);
207201
}
208202

209203
exit:

0 commit comments

Comments
 (0)