From c8f4870d7c534d958064eb63b4cc8285a2fa6cdc Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Sun, 4 Jan 2026 05:27:34 +0100 Subject: [PATCH 1/2] Improved battery symbol (#228) Rounded corners, smaller positive terminal thingy. --- src/ScreenComponents.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ScreenComponents.cpp b/src/ScreenComponents.cpp index 04265e2d..2900f3e4 100644 --- a/src/ScreenComponents.cpp +++ b/src/ScreenComponents.cpp @@ -15,21 +15,21 @@ void ScreenComponents::drawBattery(const GfxRenderer& renderer, const int left, // 1 column on left, 2 columns on right, 5 columns of battery body constexpr int batteryWidth = 15; - constexpr int batteryHeight = 10; + constexpr int batteryHeight = 12; const int x = left; - const int y = top + 8; + const int y = top + 6; // Top line - renderer.drawLine(x, y, x + batteryWidth - 4, y); + renderer.drawLine(x + 1, y, x + batteryWidth - 3, y); // Bottom line - renderer.drawLine(x, y + batteryHeight - 1, x + batteryWidth - 4, y + batteryHeight - 1); + renderer.drawLine(x + 1, y + batteryHeight - 1, x + batteryWidth - 3, y + batteryHeight - 1); // Left line - renderer.drawLine(x, y, x, y + batteryHeight - 1); + renderer.drawLine(x, y + 1, x, y + batteryHeight - 2); // Battery end - renderer.drawLine(x + batteryWidth - 4, y, x + batteryWidth - 4, y + batteryHeight - 1); - renderer.drawLine(x + batteryWidth - 3, y + 2, x + batteryWidth - 1, y + 2); - renderer.drawLine(x + batteryWidth - 3, y + batteryHeight - 3, x + batteryWidth - 1, y + batteryHeight - 3); - renderer.drawLine(x + batteryWidth - 1, y + 2, x + batteryWidth - 1, y + batteryHeight - 3); + renderer.drawLine(x + batteryWidth - 2, y + 1, x + batteryWidth - 2, y + batteryHeight - 2); + renderer.drawPixel(x + batteryWidth - 1, y + 3); + renderer.drawPixel(x + batteryWidth - 1, y + batteryHeight - 4); + renderer.drawLine(x + batteryWidth - 0, y + 4, x + batteryWidth - 0, y + batteryHeight - 5); // The +1 is to round up, so that we always fill at least one pixel int filledWidth = percentage * (batteryWidth - 5) / 100 + 1; @@ -37,5 +37,5 @@ void ScreenComponents::drawBattery(const GfxRenderer& renderer, const int left, filledWidth = batteryWidth - 5; // Ensure we don't overflow } - renderer.fillRect(x + 1, y + 1, filledWidth, batteryHeight - 2); + renderer.fillRect(x + 2, y + 2, filledWidth, batteryHeight - 4); } From 14972b34cbcfd5d4772967477e50c1f350f0f05c Mon Sep 17 00:00:00 2001 From: Dave Allie Date: Sun, 4 Jan 2026 15:08:32 +1000 Subject: [PATCH 2/2] Remove authentication type from hotspot QR code (#235) ## Summary * Remove the `T` parameter (authentication type), and `P` parameter (password) for the SoftAP wifi config QR code ## Additional Context * It is optional according to the spec: https://www.wi-fi.org/system/files/WPA3%20Specification%20v3.2.pdf#page=25 so should either be omitted or set to nopass * Fixes https://github.com/daveallie/crosspoint-reader/issues/229 --- src/activities/network/CrossPointWebServerActivity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/activities/network/CrossPointWebServerActivity.cpp b/src/activities/network/CrossPointWebServerActivity.cpp index a7160137..dde05614 100644 --- a/src/activities/network/CrossPointWebServerActivity.cpp +++ b/src/activities/network/CrossPointWebServerActivity.cpp @@ -381,7 +381,7 @@ void CrossPointWebServerActivity::renderServerRunning() const { renderer.drawCenteredText(SMALL_FONT_ID, startY + LINE_SPACING * 3, "or scan QR code with your phone to connect to Wifi."); // Show QR code for URL - std::string wifiConfig = std::string("WIFI:T:WPA;S:") + connectedSSID + ";P:" + "" + ";;"; + const std::string wifiConfig = std::string("WIFI:S:") + connectedSSID + ";;"; drawQRCode(renderer, (480 - 6 * 33) / 2, startY + LINE_SPACING * 4, wifiConfig); startY += 6 * 29 + 3 * LINE_SPACING;