From df0e36437bdd5617ec95463a519e0b5c7e5f262f Mon Sep 17 00:00:00 2001 From: nILS Date: Thu, 23 Oct 2025 21:31:32 +0200 Subject: [PATCH 1/5] fixes the legacy char->pixel position calculations in/for DrawChar --- sources/Adapters/adv/gui/advGUIWindowImp.cpp | 8 +++----- .../Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp | 8 +++----- sources/Application/AppWindow.cpp | 7 ++----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/sources/Adapters/adv/gui/advGUIWindowImp.cpp b/sources/Adapters/adv/gui/advGUIWindowImp.cpp index 4a12ebc8c..a6441aeb4 100644 --- a/sources/Adapters/adv/gui/advGUIWindowImp.cpp +++ b/sources/Adapters/adv/gui/advGUIWindowImp.cpp @@ -63,14 +63,12 @@ void advGUIWindowImp::DrawChar(const char c, GUIPoint &pos, GUITextProperties &p) { // Trace::Debug("Draw char \"%c\" at pos x:%ld (%ld), y:%ld (%ld) - invert: // %d", c, pos._x, pos._x / 8, pos._y, pos._y / 8, p.invert_); - - uint8_t x = pos._x / 8; - uint8_t y = pos._y / 8; - display_set_cursor(x, y); + display_set_cursor(pos._x, pos._x); display_putc(c, p.invert_); + if (remoteUIEnabled_) { char remoteUIBuffer[6]; - remoteUIDrawCharCommand(c, x, y, p.invert_, remoteUIBuffer); + remoteUIDrawCharCommand(c, pos._x, pos._y, p.invert_, remoteUIBuffer); sendToUSBCDCBuffered(remoteUIBuffer, 6); // Use the buffered function } } diff --git a/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp b/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp index ef66dc062..769c65e1d 100644 --- a/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp +++ b/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp @@ -68,14 +68,12 @@ void picoTrackerGUIWindowImp::DrawChar(const char c, GUIPoint &pos, GUITextProperties &p) { // Trace::Debug("Draw char \"%c\" at pos x:%ld (%ld), y:%ld (%ld) - invert: // %d", c, pos._x, pos._x / 8, pos._y, pos._y / 8, p.invert_); - - uint8_t x = pos._x / 8; - uint8_t y = pos._y / 8; - chargfx_set_cursor(x, y); + chargfx_set_cursor(pos._x, pos._y); chargfx_putc(c, p.invert_); + if (remoteUIEnabled_) { char remoteUIBuffer[6]; - remoteUIDrawCharCommand(c, x, y, p.invert_, remoteUIBuffer); + remoteUIDrawCharCommand(c, pos._x, pos._y, p.invert_, remoteUIBuffer); sendToUSBCDC(remoteUIBuffer, 6); } } diff --git a/sources/Application/AppWindow.cpp b/sources/Application/AppWindow.cpp index fcf0dba84..5073a56ef 100644 --- a/sources/Application/AppWindow.cpp +++ b/sources/Application/AppWindow.cpp @@ -79,9 +79,6 @@ GUIColor AppWindow::reserved4Color_(0xFF, 0xFF, 0x00, 15); // Initialize the animation frame counter uint32_t AppWindow::animationFrameCounter_ = 0; -int AppWindow::charWidth_ = 8; -int AppWindow::charHeight_ = 8; - void AppWindow::defineColor(FourCC colorCode, GUIColor &color, int paletteIndex) { @@ -345,9 +342,9 @@ void AppWindow::Flush() { previous++; currentProp++; previousProp++; - pos._x += AppWindow::charWidth_; + pos._x++; } - pos._y += AppWindow::charHeight_; + pos._y++; pos._x = 0; } GUIWindow::Flush(); From 9fbebdee731749a512bb7799eda5f97c5a967f44 Mon Sep 17 00:00:00 2001 From: nILS Date: Thu, 23 Oct 2025 21:38:59 +0200 Subject: [PATCH 2/5] clang-format --- .../Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp b/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp index 769c65e1d..d482b6f01 100644 --- a/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp +++ b/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp @@ -70,7 +70,7 @@ void picoTrackerGUIWindowImp::DrawChar(const char c, GUIPoint &pos, // %d", c, pos._x, pos._x / 8, pos._y, pos._y / 8, p.invert_); chargfx_set_cursor(pos._x, pos._y); chargfx_putc(c, p.invert_); - + if (remoteUIEnabled_) { char remoteUIBuffer[6]; remoteUIDrawCharCommand(c, pos._x, pos._y, p.invert_, remoteUIBuffer); @@ -148,9 +148,9 @@ void picoTrackerGUIWindowImp::SetColor(GUIColor &c) { } }; -void picoTrackerGUIWindowImp::Lock(){}; +void picoTrackerGUIWindowImp::Lock() {}; -void picoTrackerGUIWindowImp::Unlock(){}; +void picoTrackerGUIWindowImp::Unlock() {}; void picoTrackerGUIWindowImp::Flush() { chargfx_draw_changed(); }; From 8f00c501303702ec9fe1933087e456d5dd143a3d Mon Sep 17 00:00:00 2001 From: nILS Date: Thu, 23 Oct 2025 21:38:59 +0200 Subject: [PATCH 3/5] clang-format --- sources/Adapters/adv/gui/advGUIWindowImp.cpp | 5 ++--- sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sources/Adapters/adv/gui/advGUIWindowImp.cpp b/sources/Adapters/adv/gui/advGUIWindowImp.cpp index a6441aeb4..946c072c9 100644 --- a/sources/Adapters/adv/gui/advGUIWindowImp.cpp +++ b/sources/Adapters/adv/gui/advGUIWindowImp.cpp @@ -65,7 +65,6 @@ void advGUIWindowImp::DrawChar(const char c, GUIPoint &pos, // %d", c, pos._x, pos._x / 8, pos._y, pos._y / 8, p.invert_); display_set_cursor(pos._x, pos._x); display_putc(c, p.invert_); - if (remoteUIEnabled_) { char remoteUIBuffer[6]; remoteUIDrawCharCommand(c, pos._x, pos._y, p.invert_, remoteUIBuffer); @@ -134,9 +133,9 @@ void advGUIWindowImp::SetColor(GUIColor &c) { } }; -void advGUIWindowImp::Lock(){}; +void advGUIWindowImp::Lock() {}; -void advGUIWindowImp::Unlock(){}; +void advGUIWindowImp::Unlock() {}; void advGUIWindowImp::Flush() { display_draw_changed(); diff --git a/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp b/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp index 769c65e1d..9ed153a04 100644 --- a/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp +++ b/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp @@ -70,7 +70,6 @@ void picoTrackerGUIWindowImp::DrawChar(const char c, GUIPoint &pos, // %d", c, pos._x, pos._x / 8, pos._y, pos._y / 8, p.invert_); chargfx_set_cursor(pos._x, pos._y); chargfx_putc(c, p.invert_); - if (remoteUIEnabled_) { char remoteUIBuffer[6]; remoteUIDrawCharCommand(c, pos._x, pos._y, p.invert_, remoteUIBuffer); @@ -148,9 +147,9 @@ void picoTrackerGUIWindowImp::SetColor(GUIColor &c) { } }; -void picoTrackerGUIWindowImp::Lock(){}; +void picoTrackerGUIWindowImp::Lock() {}; -void picoTrackerGUIWindowImp::Unlock(){}; +void picoTrackerGUIWindowImp::Unlock() {}; void picoTrackerGUIWindowImp::Flush() { chargfx_draw_changed(); }; From d3ee48e73bd31bdfc6a11d717e00dadaa23834c0 Mon Sep 17 00:00:00 2001 From: nILS Date: Thu, 23 Oct 2025 21:31:32 +0200 Subject: [PATCH 4/5] fixes the legacy char->pixel position calculations in/for DrawChar --- sources/Adapters/adv/gui/advGUIWindowImp.cpp | 11 ++++------- .../picoTracker/gui/picoTrackerGUIWindowImp.cpp | 11 ++++------- sources/Application/AppWindow.cpp | 7 ++----- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/sources/Adapters/adv/gui/advGUIWindowImp.cpp b/sources/Adapters/adv/gui/advGUIWindowImp.cpp index 4a12ebc8c..946c072c9 100644 --- a/sources/Adapters/adv/gui/advGUIWindowImp.cpp +++ b/sources/Adapters/adv/gui/advGUIWindowImp.cpp @@ -63,14 +63,11 @@ void advGUIWindowImp::DrawChar(const char c, GUIPoint &pos, GUITextProperties &p) { // Trace::Debug("Draw char \"%c\" at pos x:%ld (%ld), y:%ld (%ld) - invert: // %d", c, pos._x, pos._x / 8, pos._y, pos._y / 8, p.invert_); - - uint8_t x = pos._x / 8; - uint8_t y = pos._y / 8; - display_set_cursor(x, y); + display_set_cursor(pos._x, pos._x); display_putc(c, p.invert_); if (remoteUIEnabled_) { char remoteUIBuffer[6]; - remoteUIDrawCharCommand(c, x, y, p.invert_, remoteUIBuffer); + remoteUIDrawCharCommand(c, pos._x, pos._y, p.invert_, remoteUIBuffer); sendToUSBCDCBuffered(remoteUIBuffer, 6); // Use the buffered function } } @@ -136,9 +133,9 @@ void advGUIWindowImp::SetColor(GUIColor &c) { } }; -void advGUIWindowImp::Lock(){}; +void advGUIWindowImp::Lock() {}; -void advGUIWindowImp::Unlock(){}; +void advGUIWindowImp::Unlock() {}; void advGUIWindowImp::Flush() { display_draw_changed(); diff --git a/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp b/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp index ef66dc062..9ed153a04 100644 --- a/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp +++ b/sources/Adapters/picoTracker/gui/picoTrackerGUIWindowImp.cpp @@ -68,14 +68,11 @@ void picoTrackerGUIWindowImp::DrawChar(const char c, GUIPoint &pos, GUITextProperties &p) { // Trace::Debug("Draw char \"%c\" at pos x:%ld (%ld), y:%ld (%ld) - invert: // %d", c, pos._x, pos._x / 8, pos._y, pos._y / 8, p.invert_); - - uint8_t x = pos._x / 8; - uint8_t y = pos._y / 8; - chargfx_set_cursor(x, y); + chargfx_set_cursor(pos._x, pos._y); chargfx_putc(c, p.invert_); if (remoteUIEnabled_) { char remoteUIBuffer[6]; - remoteUIDrawCharCommand(c, x, y, p.invert_, remoteUIBuffer); + remoteUIDrawCharCommand(c, pos._x, pos._y, p.invert_, remoteUIBuffer); sendToUSBCDC(remoteUIBuffer, 6); } } @@ -150,9 +147,9 @@ void picoTrackerGUIWindowImp::SetColor(GUIColor &c) { } }; -void picoTrackerGUIWindowImp::Lock(){}; +void picoTrackerGUIWindowImp::Lock() {}; -void picoTrackerGUIWindowImp::Unlock(){}; +void picoTrackerGUIWindowImp::Unlock() {}; void picoTrackerGUIWindowImp::Flush() { chargfx_draw_changed(); }; diff --git a/sources/Application/AppWindow.cpp b/sources/Application/AppWindow.cpp index fcf0dba84..5073a56ef 100644 --- a/sources/Application/AppWindow.cpp +++ b/sources/Application/AppWindow.cpp @@ -79,9 +79,6 @@ GUIColor AppWindow::reserved4Color_(0xFF, 0xFF, 0x00, 15); // Initialize the animation frame counter uint32_t AppWindow::animationFrameCounter_ = 0; -int AppWindow::charWidth_ = 8; -int AppWindow::charHeight_ = 8; - void AppWindow::defineColor(FourCC colorCode, GUIColor &color, int paletteIndex) { @@ -345,9 +342,9 @@ void AppWindow::Flush() { previous++; currentProp++; previousProp++; - pos._x += AppWindow::charWidth_; + pos._x++; } - pos._y += AppWindow::charHeight_; + pos._y++; pos._x = 0; } GUIWindow::Flush(); From 5d604bf2974197e2b61df89293890339bbf7f451 Mon Sep 17 00:00:00 2001 From: nILS Date: Fri, 24 Oct 2025 10:46:29 +0200 Subject: [PATCH 5/5] clang-format --- sources/Adapters/adv/gui/advGUIWindowImp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/Adapters/adv/gui/advGUIWindowImp.cpp b/sources/Adapters/adv/gui/advGUIWindowImp.cpp index 946c072c9..eee4a8fc9 100644 --- a/sources/Adapters/adv/gui/advGUIWindowImp.cpp +++ b/sources/Adapters/adv/gui/advGUIWindowImp.cpp @@ -133,9 +133,9 @@ void advGUIWindowImp::SetColor(GUIColor &c) { } }; -void advGUIWindowImp::Lock() {}; +void advGUIWindowImp::Lock() {} -void advGUIWindowImp::Unlock() {}; +void advGUIWindowImp::Unlock() {} void advGUIWindowImp::Flush() { display_draw_changed();