Skip to content

Commit 581b1f8

Browse files
vanvughtvanvught
committed
Apply brace/formatting changes and cleanup
Update .clang-format to use Attach brace style and apply resulting formatting changes across firmware sources. Tidied initializers and combined single-line aggregates, normalized brace placement for if/for/namespace/function blocks, fixed a preprocessor spacing, removed trailing whitespace, and bumped copyright year in gd32_rdm_responder. These are non-functional style/formatting edits.
1 parent f5b92df commit 581b1f8

5 files changed

Lines changed: 21 additions & 37 deletions

File tree

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ AllowShortFunctionsOnASingleLine: Inline
1414
AllowShortIfStatementsOnASingleLine: true
1515
AllowShortLoopsOnASingleLine: true
1616

17-
BreakBeforeBraces: Allman
17+
BreakBeforeBraces: Attach
1818

1919
DerivePointerAlignment: false
2020

‎gd32_dmx_usb_pro/firmware/main.cpp‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,14 @@
3838
#define ALIGNED __attribute__((aligned(4)))
3939
#endif
4040

41-
static constexpr char kWidgetModeNames[4][12] ALIGNED =
42-
{
41+
static constexpr char kWidgetModeNames[4][12] ALIGNED = {
4342
"DMX_RDM",
4443
"DMX",
4544
"RDM",
4645
"RDM_SNIFFER"
4746
};
4847

49-
static constexpr rdm::device::InfoData kDeviceLabel ALIGNED =
50-
{
51-
const_cast<char*>("GD32F103RC DMX USB Pro"),
52-
22
53-
};
48+
static constexpr rdm::device::InfoData kDeviceLabel ALIGNED = {const_cast<char*>("GD32F103RC DMX USB Pro"), 22};
5449

5550
int main() // NOLINT
5651
{
@@ -80,14 +75,12 @@ int main() // NOLINT
8075

8176
hal::WatchdogInit();
8277

83-
if (kWidgetMode == widget::Mode::kRdmSniffer)
84-
{
78+
if (kWidgetMode == widget::Mode::kRdmSniffer) {
8579
widget.SetPortDirection(0, dmx::PortDirection::kInput, true);
8680
widget.SnifferFillTransmitBuffer(); // Prevent missing first frame
8781
}
8882

89-
for (;;)
90-
{
83+
for (;;) {
9184
hal::WatchdogFeed();
9285
widget.Run();
9386
hal::Run();

‎gd32_rdm_responder/.settings/language.settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="([^/\\\\]*)((g?cc)|([gc]\+\+)|(clang))" prefer-non-shared="true"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1126052751785405339" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1517638656733496407" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎gd32_rdm_responder/firmware/main.cpp‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @file main.cpp
33
*/
4-
/* Copyright (C) 2021-2025 by Arjan van Vught mailto:info@gd32-dmx.org
4+
/* Copyright (C) 2021-2026 by Arjan van Vught mailto:info@gd32-dmx.org
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal
@@ -47,10 +47,8 @@
4747
#include "remoteconfig.h"
4848
#endif
4949

50-
namespace hal
51-
{
52-
void RebootHandler()
53-
{
50+
namespace hal {
51+
void RebootHandler() {
5452
PixelDmx::Get().Blackout();
5553
}
5654
} // namespace hal
@@ -60,9 +58,9 @@ int main() // NOLINT
6058
hal::Init();
6159
DisplayUdf display;
6260
ConfigStore config_store;
63-
#if !defined(NO_EMAC)
61+
#if !defined(NO_EMAC)
6462
network::Init();
65-
#endif
63+
#endif
6664
FirmwareVersion fw(kSoftwareVersion, __DATE__, __TIME__);
6765

6866
const auto kIsConfigMode = IsConfigMode();
@@ -80,13 +78,12 @@ int main() // NOLINT
8078
PixelTestPattern pixel_test_pattern(kTestPattern, 1);
8179

8280
PixelDmxParamsRdm pixeldmx_paramsrdm;
83-
81+
8482
#if defined(CONFIG_RDM_MANUFACTURER_PIDS_SET)
8583
static constexpr auto kPersonalityCount = static_cast<uint32_t>(pixel::LedType::kUndefined);
8684
RDMPersonality* personalities[kPersonalityCount];
8785

88-
for (uint32_t index = 0; index < kPersonalityCount; index++)
89-
{
86+
for (uint32_t index = 0; index < kPersonalityCount; index++) {
9087
const auto* description = pixel::GetTypeName(static_cast<pixel::LedType>(index));
9188
personalities[index] = new RDMPersonality(description, &pixeldmx);
9289
}
@@ -95,7 +92,7 @@ int main() // NOLINT
9592
#else
9693
char description[rdm::personality::DESCRIPTION_MAX_LENGTH];
9794
pixeldmx::paramsdmx::SetPersonalityDescription(description);
98-
95+
9996
RDMPersonality* personalities[2] = {new RDMPersonality(description, &pixeldmx), new RDMPersonality("Config mode", &pixeldmx_paramsrdm)};
10097
RDMResponder rdm_responder(personalities, 2);
10198
#endif
@@ -104,17 +101,13 @@ int main() // NOLINT
104101
rdm_responder.DmxDisableOutput(!kIsConfigMode && (kTestPattern != pixelpatterns::Pattern::kNone));
105102
rdm_responder.Print();
106103

107-
if (kIsConfigMode)
108-
{
104+
if (kIsConfigMode) {
109105
pixeldmx_paramsrdm.Print();
110-
}
111-
else
112-
{
106+
} else {
113107
pixeldmx.Print();
114108
}
115109

116-
if (kIsConfigMode)
117-
{
110+
if (kIsConfigMode) {
118111
puts("Config mode");
119112
}
120113

@@ -132,8 +125,7 @@ int main() // NOLINT
132125

133126
common::firmware::pixeldmx::Show(7);
134127

135-
if (kIsConfigMode)
136-
{
128+
if (kIsConfigMode) {
137129
display.ClearLine(3);
138130
display.ClearLine(4);
139131
display.Write(4, "Config Mode");
@@ -143,8 +135,7 @@ int main() // NOLINT
143135
hal::statusled::SetMode(hal::statusled::Mode::NORMAL);
144136
hal::WatchdogInit();
145137

146-
for (;;)
147-
{
138+
for (;;) {
148139
hal::WatchdogFeed();
149140
rdm_responder.Run();
150141
#if !defined(NO_EMAC)

‎lib-configstore/.settings/language.settings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1681532771064502334" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1449381983277329008" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
@@ -14,7 +14,7 @@
1414
</configuration>
1515
<configuration id="cdt.managedbuild.toolchain.gnu.cross.base.999241968.974157274.211492271.1465431049.1736081614" name="GD32">
1616
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
17-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1088956125728426244" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
17+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1554735282790475502" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
1818
<language-scope id="org.eclipse.cdt.core.gcc"/>
1919
<language-scope id="org.eclipse.cdt.core.g++"/>
2020
</provider>

0 commit comments

Comments
 (0)