Skip to content

Commit 8579fd9

Browse files
committed
Fix widget mode printf type and cleanups
Removes a duplicate `board.h` include and tidies static constant declarations in `main.cpp`. It also updates widget mode logging to use `%u` with an unsigned cast, avoiding signed/enum format mismatches when printing `kWidgetMode`.
1 parent 74f0e02 commit 8579fd9

1 file changed

Lines changed: 8 additions & 11 deletions

File tree

gd32_dmx_usb_pro/firmware/main.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,20 @@
3232
#include "configstore.h"
3333
#include "software_version.h"
3434
#include "../../lib-board/include/board.h"
35-
#include "../../lib-board/include/board.h"
3635

3736
#ifndef ALIGNED
3837
#define ALIGNED __attribute__((aligned(4)))
3938
#endif
4039

41-
static constexpr char kWidgetModeNames[4][12] ALIGNED = {
42-
"DMX_RDM",
43-
"DMX",
44-
"RDM",
45-
"RDM_SNIFFER"
46-
};
47-
48-
static constexpr rdm::device::InfoData kDeviceLabel ALIGNED = {const_cast<char*>("GD32F103RC DMX USB Pro"), 22};
40+
static constexpr char kWidgetModeNames[4][12] ALIGNED = {"DMX_RDM", "DMX", "RDM", "RDM_SNIFFER"};
4941

50-
int main() // NOLINT
42+
static constexpr rdm::device::InfoData kDeviceLabel ALIGNED =
5143
{
44+
.data = const_cast<char*>("GD32F103RC DMX USB Pro"),
45+
.length = 22
46+
};
47+
48+
int main() { // NOLINT
5249
board::Init();
5350
ConfigStore config_store;
5451

@@ -69,7 +66,7 @@ int main() // NOLINT
6966

7067
uint8_t hw_text_length;
7168
printf("[V%s] %s Compiled on %s at %s\n", kSoftwareVersion, board::BoardName(hw_text_length), __DATE__, __TIME__);
72-
printf("RDM Controller with USB [Compatible with Enttec USB Pro protocol], Widget mode : %d (%s)\n", kWidgetMode, kWidgetModeNames[static_cast<uint32_t>(kWidgetMode)]);
69+
printf("RDM Controller with USB [Compatible with Enttec USB Pro protocol], Widget mode : %u (%s)\n", static_cast<unsigned>(kWidgetMode), kWidgetModeNames[static_cast<unsigned>(kWidgetMode)]);
7370
printf("Device UUID : %.2x%.2x:%.2x%.2x%.2x%.2x, ", uid[0], uid[1], uid[2], uid[3], uid[4], uid[5]);
7471
printf("Label : %.*s\n", static_cast<int>(label.length), reinterpret_cast<const char*>(label.data));
7572

0 commit comments

Comments
 (0)