Skip to content

Commit e695f23

Browse files
restyled-commitssabollim-silabs
restyled-commits
authored and
sabollim-silabs
committed
Restyled by clang-format
1 parent e0a43a0 commit e695f23

File tree

5 files changed

+69
-65
lines changed

5 files changed

+69
-65
lines changed

‎examples/closure-app/silabs/include/ClosureUI.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
#pragma once
2020

21+
#include "ClosureUIStrings.h"
2122
#include "glib.h"
2223
#include "lcd.h"
23-
#include "ClosureUIStrings.h"
2424
#include <app-common/zap-generated/cluster-objects.h>
2525
#include <app/clusters/closure-control-server/closure-control-cluster-objects.h>
2626
#include <app/data-model/Nullable.h>

‎examples/closure-app/silabs/include/ClosureUIStrings.h‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -34,49 +34,49 @@
3434

3535
namespace ClosureUIStrings {
3636

37-
inline constexpr const char POSITION_PREFIX[] = "Position: ";
38-
inline constexpr const char POSITION_SUFFIX_UNKNOWN[] = "Unknown";
39-
inline constexpr const char POSITION_SUFFIX_CLOSED[] = "Closed";
40-
inline constexpr const char POSITION_SUFFIX_OPEN[] = "Open";
41-
inline constexpr const char POSITION_SUFFIX_PARTIAL[] = "Partial";
42-
inline constexpr const char POSITION_SUFFIX_PEDESTRIAN[] = "Pedestrian";
43-
inline constexpr const char POSITION_SUFFIX_VENTILATION[] = "Ventilation";
37+
inline constexpr const char POSITION_PREFIX[] = "Position: ";
38+
inline constexpr const char POSITION_SUFFIX_UNKNOWN[] = "Unknown";
39+
inline constexpr const char POSITION_SUFFIX_CLOSED[] = "Closed";
40+
inline constexpr const char POSITION_SUFFIX_OPEN[] = "Open";
41+
inline constexpr const char POSITION_SUFFIX_PARTIAL[] = "Partial";
42+
inline constexpr const char POSITION_SUFFIX_PEDESTRIAN[] = "Pedestrian";
43+
inline constexpr const char POSITION_SUFFIX_VENTILATION[] = "Ventilation";
4444

45-
inline constexpr const char LATCH_PREFIX[] = "Latch: ";
46-
inline constexpr const char LATCH_SUFFIX_UNKNOWN[] = "Unknown";
47-
inline constexpr const char LATCH_SUFFIX_ENGAGED[] = "Engaged";
48-
inline constexpr const char LATCH_SUFFIX_RELEASED[] = "Released";
45+
inline constexpr const char LATCH_PREFIX[] = "Latch: ";
46+
inline constexpr const char LATCH_SUFFIX_UNKNOWN[] = "Unknown";
47+
inline constexpr const char LATCH_SUFFIX_ENGAGED[] = "Engaged";
48+
inline constexpr const char LATCH_SUFFIX_RELEASED[] = "Released";
4949

50-
inline constexpr const char SECURE_PREFIX[] = "Secure: ";
51-
inline constexpr const char SECURE_SUFFIX_UNKNOWN[] = "Unknown";
52-
inline constexpr const char SECURE_SUFFIX_YES[] = "Yes";
53-
inline constexpr const char SECURE_SUFFIX_NO[] = "No";
50+
inline constexpr const char SECURE_PREFIX[] = "Secure: ";
51+
inline constexpr const char SECURE_SUFFIX_UNKNOWN[] = "Unknown";
52+
inline constexpr const char SECURE_SUFFIX_YES[] = "Yes";
53+
inline constexpr const char SECURE_SUFFIX_NO[] = "No";
5454

55-
inline constexpr const char SPEED_PREFIX[] = "Speed: ";
56-
inline constexpr const char SPEED_SUFFIX_UNKNOWN[] = "Unknown";
57-
inline constexpr const char SPEED_SUFFIX_LOW[] = "Low";
58-
inline constexpr const char SPEED_SUFFIX_MEDIUM[] = "Medium";
59-
inline constexpr const char SPEED_SUFFIX_HIGH[] = "High";
60-
inline constexpr const char SPEED_SUFFIX_AUTO[] = "Auto";
55+
inline constexpr const char SPEED_PREFIX[] = "Speed: ";
56+
inline constexpr const char SPEED_SUFFIX_UNKNOWN[] = "Unknown";
57+
inline constexpr const char SPEED_SUFFIX_LOW[] = "Low";
58+
inline constexpr const char SPEED_SUFFIX_MEDIUM[] = "Medium";
59+
inline constexpr const char SPEED_SUFFIX_HIGH[] = "High";
60+
inline constexpr const char SPEED_SUFFIX_AUTO[] = "Auto";
6161

62-
inline constexpr const char STATE_PREFIX[] = "State: ";
63-
inline constexpr const char STATE_SUFFIX_STOPPED[] = "Stopped";
64-
inline constexpr const char STATE_SUFFIX_MOVING[] = "Moving";
65-
inline constexpr const char STATE_SUFFIX_WAITING[] = "Waiting";
66-
inline constexpr const char STATE_SUFFIX_ERROR[] = "Error";
67-
inline constexpr const char STATE_SUFFIX_CALIBRATING[] = "Calibrating";
68-
inline constexpr const char STATE_SUFFIX_PROTECTED[] = "Protected";
69-
inline constexpr const char STATE_SUFFIX_DISENGAGED[] = "Disengaged";
70-
inline constexpr const char STATE_SUFFIX_SETUP_REQUIRED[] = "Setup Required";
71-
inline constexpr const char STATE_SUFFIX_UNKNOWN[] = "Unknown";
62+
inline constexpr const char STATE_PREFIX[] = "State: ";
63+
inline constexpr const char STATE_SUFFIX_STOPPED[] = "Stopped";
64+
inline constexpr const char STATE_SUFFIX_MOVING[] = "Moving";
65+
inline constexpr const char STATE_SUFFIX_WAITING[] = "Waiting";
66+
inline constexpr const char STATE_SUFFIX_ERROR[] = "Error";
67+
inline constexpr const char STATE_SUFFIX_CALIBRATING[] = "Calibrating";
68+
inline constexpr const char STATE_SUFFIX_PROTECTED[] = "Protected";
69+
inline constexpr const char STATE_SUFFIX_DISENGAGED[] = "Disengaged";
70+
inline constexpr const char STATE_SUFFIX_SETUP_REQUIRED[] = "Setup Required";
71+
inline constexpr const char STATE_SUFFIX_UNKNOWN[] = "Unknown";
7272

73-
inline constexpr const char FOOTER_TEXT[] = "Closure App";
73+
inline constexpr const char FOOTER_TEXT[] = "Closure App";
7474

75-
// Buffer sizes for UI text arrays (single source of truth)
76-
// These are calculated as: (prefix length + longest suffix length) + 1 (for null terminator)
77-
inline constexpr size_t BUFFER_SIZE_POSITION = 23;
78-
inline constexpr size_t BUFFER_SIZE_LATCH = 16;
79-
inline constexpr size_t BUFFER_SIZE_SECURE = 16;
80-
inline constexpr size_t BUFFER_SIZE_SPEED = 15;
81-
inline constexpr size_t BUFFER_SIZE_STATE = 23;
82-
}
75+
// Buffer sizes for UI text arrays (single source of truth)
76+
// These are calculated as: (prefix length + longest suffix length) + 1 (for null terminator)
77+
inline constexpr size_t BUFFER_SIZE_POSITION = 23;
78+
inline constexpr size_t BUFFER_SIZE_LATCH = 16;
79+
inline constexpr size_t BUFFER_SIZE_SECURE = 16;
80+
inline constexpr size_t BUFFER_SIZE_SPEED = 15;
81+
inline constexpr size_t BUFFER_SIZE_STATE = 23;
82+
} // namespace ClosureUIStrings

‎examples/closure-app/silabs/src/AppTask.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
#include <lib/support/BitMask.h>
4646
#include <lib/support/CodeUtils.h>
4747
#include <platform/CHIPDeviceLayer.h>
48-
#include <stdio.h>
4948
#include <platform/silabs/platformAbstraction/SilabsPlatform.h>
5049
#include <setup_payload/OnboardingCodesUtil.h>
5150
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
5251
#include <setup_payload/SetupPayload.h>
52+
#include <stdio.h>
5353

5454
#define APP_FUNCTION_BUTTON 0
5555
#define APP_CLOSURE_BUTTON 1
@@ -151,7 +151,6 @@ void AppTask::UpdateClosureUI()
151151
{
152152
ClosureManager & closureManager = ClosureManager::GetInstance();
153153

154-
155154
DeviceLayer::PlatformMgr().LockChipStack();
156155
auto uiData = closureManager.GetClosureUIData();
157156
DeviceLayer::PlatformMgr().UnlockChipStack();
@@ -190,14 +189,16 @@ void AppTask::UpdateClosureUI()
190189
if (!uiData.overallCurrentState.IsNull() && uiData.overallCurrentState.Value().latch.HasValue() &&
191190
!uiData.overallCurrentState.Value().latch.Value().IsNull())
192191
{
193-
latchSuffix = uiData.overallCurrentState.Value().latch.Value().Value() ? ClosureUIStrings::LATCH_SUFFIX_ENGAGED : ClosureUIStrings::LATCH_SUFFIX_RELEASED;
192+
latchSuffix = uiData.overallCurrentState.Value().latch.Value().Value() ? ClosureUIStrings::LATCH_SUFFIX_ENGAGED
193+
: ClosureUIStrings::LATCH_SUFFIX_RELEASED;
194194
}
195195
ClosureUI::FormatAndSetLatch(latchSuffix);
196196

197197
const char * secureSuffix = ClosureUIStrings::SECURE_SUFFIX_UNKNOWN;
198198
if (!uiData.overallCurrentState.IsNull() && !uiData.overallCurrentState.Value().secureState.IsNull())
199199
{
200-
secureSuffix = uiData.overallCurrentState.Value().secureState.Value() ? ClosureUIStrings::SECURE_SUFFIX_YES : ClosureUIStrings::SECURE_SUFFIX_NO;
200+
secureSuffix = uiData.overallCurrentState.Value().secureState.Value() ? ClosureUIStrings::SECURE_SUFFIX_YES
201+
: ClosureUIStrings::SECURE_SUFFIX_NO;
201202
}
202203
ClosureUI::FormatAndSetSecure(secureSuffix);
203204

‎examples/closure-app/silabs/src/ClosureUI.cpp‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,16 @@ static const uint8_t threadLogo[] = { THREAD_BITMAP };
5959
static const uint8_t bleLogo[] = { BLUETOOTH_ICON_SMALL };
6060

6161
// Static variables to hold the current closure state
62-
chip::app::Clusters::ClosureControl::MainStateEnum ClosureUI::sMainState = chip::app::Clusters::ClosureControl::MainStateEnum::kUnknownEnumValue;
62+
chip::app::Clusters::ClosureControl::MainStateEnum ClosureUI::sMainState =
63+
chip::app::Clusters::ClosureControl::MainStateEnum::kUnknownEnumValue;
6364

6465
// Helper function to format text using prefix + suffix
6566
namespace {
66-
inline void FormatText(char * dest, size_t destSize, const char * prefix, const char * suffix)
67-
{
68-
snprintf(dest, destSize, "%s%s", prefix, suffix);
69-
}
67+
inline void FormatText(char * dest, size_t destSize, const char * prefix, const char * suffix)
68+
{
69+
snprintf(dest, destSize, "%s%s", prefix, suffix);
7070
}
71+
} // namespace
7172

7273
// Initialize arrays using buffer sizes
7374
char ClosureUI::sPositionText[ClosureUIStrings::BUFFER_SIZE_POSITION];
@@ -77,18 +78,20 @@ char ClosureUI::sSpeedText[ClosureUIStrings::BUFFER_SIZE_SPEED];
7778
char ClosureUI::sStateText[ClosureUIStrings::BUFFER_SIZE_STATE];
7879

7980
// Static initializer to set default values using prefix + suffix
80-
struct ClosureUITextInitializer {
81-
ClosureUITextInitializer() {
82-
FormatText(ClosureUI::sPositionText, sizeof(ClosureUI::sPositionText),
83-
ClosureUIStrings::POSITION_PREFIX, ClosureUIStrings::POSITION_SUFFIX_UNKNOWN);
84-
FormatText(ClosureUI::sLatchText, sizeof(ClosureUI::sLatchText),
85-
ClosureUIStrings::LATCH_PREFIX, ClosureUIStrings::LATCH_SUFFIX_UNKNOWN);
86-
FormatText(ClosureUI::sSecureText, sizeof(ClosureUI::sSecureText),
87-
ClosureUIStrings::SECURE_PREFIX, ClosureUIStrings::SECURE_SUFFIX_UNKNOWN);
88-
FormatText(ClosureUI::sSpeedText, sizeof(ClosureUI::sSpeedText),
89-
ClosureUIStrings::SPEED_PREFIX, ClosureUIStrings::SPEED_SUFFIX_UNKNOWN);
90-
FormatText(ClosureUI::sStateText, sizeof(ClosureUI::sStateText),
91-
ClosureUIStrings::STATE_PREFIX, ClosureUIStrings::STATE_SUFFIX_UNKNOWN);
81+
struct ClosureUITextInitializer
82+
{
83+
ClosureUITextInitializer()
84+
{
85+
FormatText(ClosureUI::sPositionText, sizeof(ClosureUI::sPositionText), ClosureUIStrings::POSITION_PREFIX,
86+
ClosureUIStrings::POSITION_SUFFIX_UNKNOWN);
87+
FormatText(ClosureUI::sLatchText, sizeof(ClosureUI::sLatchText), ClosureUIStrings::LATCH_PREFIX,
88+
ClosureUIStrings::LATCH_SUFFIX_UNKNOWN);
89+
FormatText(ClosureUI::sSecureText, sizeof(ClosureUI::sSecureText), ClosureUIStrings::SECURE_PREFIX,
90+
ClosureUIStrings::SECURE_SUFFIX_UNKNOWN);
91+
FormatText(ClosureUI::sSpeedText, sizeof(ClosureUI::sSpeedText), ClosureUIStrings::SPEED_PREFIX,
92+
ClosureUIStrings::SPEED_SUFFIX_UNKNOWN);
93+
FormatText(ClosureUI::sStateText, sizeof(ClosureUI::sStateText), ClosureUIStrings::STATE_PREFIX,
94+
ClosureUIStrings::STATE_SUFFIX_UNKNOWN);
9295
}
9396
};
9497
static ClosureUITextInitializer sInitializer;
@@ -133,7 +136,8 @@ void ClosureUI::SetOverallCurrentState(const char * positionText, const char * l
133136
}
134137
else
135138
{
136-
FormatText(sPositionText, sizeof(sPositionText), ClosureUIStrings::POSITION_PREFIX, ClosureUIStrings::POSITION_SUFFIX_UNKNOWN);
139+
FormatText(sPositionText, sizeof(sPositionText), ClosureUIStrings::POSITION_PREFIX,
140+
ClosureUIStrings::POSITION_SUFFIX_UNKNOWN);
137141
}
138142

139143
if (latchText != nullptr)
@@ -236,7 +240,6 @@ void ClosureUI::DrawFooter(GLIB_Context_t * glibContext)
236240
GLIB_drawStringOnLine(glibContext, ClosureUIStrings::FOOTER_TEXT, FOOTER_DISPLAY_LINE, GLIB_ALIGN_CENTER, 0, 0, true);
237241
}
238242

239-
240243
void ClosureUI::FormatAndSetPosition(const char * suffix)
241244
{
242245
const char * safeSuffix = (suffix != nullptr) ? suffix : ClosureUIStrings::POSITION_SUFFIX_UNKNOWN;

‎examples/closure-app/silabs/src/DataModelCallbacks.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attrib
5353
/* Forwards all attributes changes */
5454
void MatterClosureControlClusterServerAttributeChangedCallback(const app::ConcreteAttributePath & attributePath)
5555
{
56-
ChipLogProgress(Zcl, "Closure Control cluster ID: " ChipLogFormatMEI, ChipLogValueMEI(attributePath.mAttributeId));
56+
ChipLogProgress(Zcl, "Closure Control cluster ID: " ChipLogFormatMEI, ChipLogValueMEI(attributePath.mAttributeId));
5757
#ifdef DISPLAY_ENABLED
5858
using namespace chip::app::Clusters::ClosureControl::Attributes;
5959

0 commit comments

Comments
 (0)