Update ArduinoJson to v7

* Implement graduated scaling for NodeInfo send timeout based on active mesh size

* Shorter timeout still needed for pubkey unkown and ad-hoc send

* Update src/modules/NodeInfoModule.cpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

src/Power.cpp

@@ -723,6 +723,16 @@ bool Power::setup()
             runASAP = true;
         },
         CHANGE);
+#endif
+#ifdef EXT_CHRG_DETECT
+    attachInterrupt(
+        EXT_CHRG_DETECT,
+        []() {
+            power->setIntervalFromNow(0);
+            runASAP = true;
+            BaseType_t higherWake = 0;
+        },
+        CHANGE);
 #endif
     enabled = found;
     low_voltage_counter = 0;

src/graphics/draw/MessageRenderer.cpp

@@ -6,6 +6,7 @@
 #include "MessageStore.h"
 #include "NodeDB.h"
 #include "UIRenderer.h"
+#include "configuration.h"
 #include "gps/RTC.h"
 #include "graphics/Screen.h"
 #include "graphics/ScreenFonts.h"
@@ -19,6 +20,7 @@
 
 // External declarations
 extern bool hasUnreadMessage;
+extern meshtastic_DeviceState devicestate;
 extern graphics::Screen *screen;
 
 using graphics::Emote;
@@ -47,7 +49,7 @@ static inline size_t utf8CharLen(uint8_t c)
 }
 
 // Remove variation selectors (FE0F) and skin tone modifiers from emoji so they match your labels
-static std::string normalizeEmoji(const std::string &s)
+std::string normalizeEmoji(const std::string &s)
 {
     std::string out;
     for (size_t i = 0; i < s.size();) {
@@ -80,7 +82,6 @@ uint32_t pauseStart = 0;
 bool waitingToReset = false;
 bool scrollStarted = false;
 static bool didReset = false;
-static constexpr int MESSAGE_BLOCK_GAP = 6;
 
 void scrollUp()
 {
@@ -110,6 +111,22 @@ void scrollDown()
 
 void drawStringWithEmotes(OLEDDisplay *display, int x, int y, const std::string &line, const Emote *emotes, int emoteCount)
 {
+    std::string renderLine;
+    for (size_t i = 0; i < line.size();) {
+        uint8_t c = (uint8_t)line[i];
+        size_t len = utf8CharLen(c);
+        if (c == 0xEF && i + 2 < line.size() && (uint8_t)line[i + 1] == 0xB8 && (uint8_t)line[i + 2] == 0x8F) {
+            i += 3;
+            continue;
+        }
+        if (c == 0xF0 && i + 3 < line.size() && (uint8_t)line[i + 1] == 0x9F && (uint8_t)line[i + 2] == 0x8F &&
+            ((uint8_t)line[i + 3] >= 0xBB && (uint8_t)line[i + 3] <= 0xBF)) {
+            i += 4;
+            continue;
+        }
+        renderLine.append(line, i, len);
+        i += len;
+    }
     int cursorX = x;
     const int fontHeight = FONT_HEIGHT_SMALL;
 
@@ -186,7 +203,8 @@ void drawStringWithEmotes(OLEDDisplay *display, int x, int y, const std::string
 
         // Render the emote (if found)
         if (matchedEmote && i == nextEmotePos) {
-            int iconY = y + (lineHeight - matchedEmote->height) / 2;
+            // Vertically center emote relative to font baseline (not just midline)
+            int iconY = fontY + (fontHeight - matchedEmote->height) / 2;
             display->drawXbm(cursorX, iconY, matchedEmote->width, matchedEmote->height, matchedEmote->bitmap);
             cursorX += matchedEmote->width + 1;
             i += emojiLen;
@@ -405,102 +423,6 @@ static inline int getRenderedLineWidth(OLEDDisplay *display, const std::string &
     return totalWidth;
 }
 
-struct MessageBlock {
-    size_t start;
-    size_t end;
-    bool mine;
-};
-
-static int getDrawnLinePixelBottom(int lineTopY, const std::string &line, bool isHeaderLine)
-{
-    if (isHeaderLine) {
-        return lineTopY + (FONT_HEIGHT_SMALL - 1);
-    }
-
-    int tallest = FONT_HEIGHT_SMALL;
-    for (int e = 0; e < numEmotes; ++e) {
-        if (line.find(emotes[e].label) != std::string::npos) {
-            if (emotes[e].height > tallest)
-                tallest = emotes[e].height;
-        }
-    }
-
-    const int lineHeight = std::max(FONT_HEIGHT_SMALL, tallest);
-    const int iconTop = lineTopY + (lineHeight - tallest) / 2;
-
-    return iconTop + tallest - 1;
-}
-
-static void drawRoundedRectOutline(OLEDDisplay *display, int x, int y, int w, int h, int r)
-{
-    if (w <= 1 || h <= 1)
-        return;
-
-    if (r < 0)
-        r = 0;
-
-    int maxR = (std::min(w, h) / 2) - 1;
-    if (r > maxR)
-        r = maxR;
-
-    if (r == 0) {
-        display->drawRect(x, y, w, h);
-        return;
-    }
-
-    const int x0 = x;
-    const int y0 = y;
-    const int x1 = x + w - 1;
-    const int y1 = y + h - 1;
-
-    // sides
-    if (x0 + r <= x1 - r) {
-        display->drawLine(x0 + r, y0, x1 - r, y0); // top
-        display->drawLine(x0 + r, y1, x1 - r, y1); // bottom
-    }
-    if (y0 + r <= y1 - r) {
-        display->drawLine(x0, y0 + r, x0, y1 - r); // left
-        display->drawLine(x1, y0 + r, x1, y1 - r); // right
-    }
-
-    // corner arcs
-    display->drawCircleQuads(x0 + r, y0 + r, r, 2); // top left
-    display->drawCircleQuads(x1 - r, y0 + r, r, 1); // top right
-    display->drawCircleQuads(x1 - r, y1 - r, r, 8); // bottom right
-    display->drawCircleQuads(x0 + r, y1 - r, r, 4); // bottom left
-}
-
-static std::vector<MessageBlock> buildMessageBlocks(const std::vector<bool> &isHeaderVec, const std::vector<bool> &isMineVec)
-{
-    std::vector<MessageBlock> blocks;
-    if (isHeaderVec.empty())
-        return blocks;
-
-    size_t start = 0;
-    bool mine = isMineVec[0];
-
-    for (size_t i = 1; i < isHeaderVec.size(); ++i) {
-        if (isHeaderVec[i]) {
-            MessageBlock b;
-            b.start = start;
-            b.end = i - 1;
-            b.mine = mine;
-            blocks.push_back(b);
-
-            start = i;
-            mine = isMineVec[i];
-        }
-    }
-
-    MessageBlock last;
-    last.start = start;
-    last.end = isHeaderVec.size() - 1;
-    last.mine = mine;
-    blocks.push_back(last);
-
-    return blocks;
-}
-
 static void drawMessageScrollbar(OLEDDisplay *display, int visibleHeight, int totalHeight, int scrollOffset, int startY)
 {
     if (totalHeight <= visibleHeight)
@@ -745,8 +667,6 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     cachedLines = allLines;
     cachedHeights = calculateLineHeights(cachedLines, emotes, isHeader);
 
-    std::vector<MessageBlock> blocks = buildMessageBlocks(isHeader, isMine);
-
     // Scrolling logic (unchanged)
     int totalHeight = 0;
     for (size_t i = 0; i < cachedHeights.size(); ++i)
@@ -794,128 +714,12 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 
     int finalScroll = (int)scrollY;
     int yOffset = -finalScroll + getTextPositions(display)[1];
-    constexpr int BUBBLE_PAD_X = 3;
-    constexpr int BUBBLE_PAD_Y = 4;
-    constexpr int BUBBLE_RADIUS = 4;
-    constexpr int BUBBLE_MIN_W = 24;
-    constexpr int BUBBLE_TEXT_INDENT = 2;
-    const int contentTop = getTextPositions(display)[1];
-    const int contentBottom = scrollBottom; // already excludes nav line
-    const int rightEdge = SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN;
-    const int bubbleGapY = std::max(1, MESSAGE_BLOCK_GAP / 2);
-
-    std::vector<int> lineTop;
-    lineTop.resize(cachedLines.size());
-    {
-        int acc = 0;
-        for (size_t i = 0; i < cachedLines.size(); ++i) {
-            lineTop[i] = yOffset + acc;
-            acc += cachedHeights[i];
-        }
-    }
-
-    // Draw bubbles
-    for (size_t bi = 0; bi < blocks.size(); ++bi) {
-        const auto &b = blocks[bi];
-        if (b.start >= cachedLines.size() || b.end >= cachedLines.size() || b.start > b.end)
-            continue;
-
-        int visualTop = lineTop[b.start];
-
-        int topY;
-        if (isHeader[b.start]) {
-            // Header start
-            constexpr int BUBBLE_PAD_TOP_HEADER = 1; // try 1 or 2
-            topY = visualTop - BUBBLE_PAD_TOP_HEADER;
-        } else {
-            // Body start
-            bool thisLineHasEmote = false;
-            for (int e = 0; e < numEmotes; ++e) {
-                if (cachedLines[b.start].find(emotes[e].label) != std::string::npos) {
-                    thisLineHasEmote = true;
-                    break;
-                }
-            }
-            if (thisLineHasEmote) {
-                constexpr int EMOTE_PADDING_ABOVE = 4;
-                visualTop -= EMOTE_PADDING_ABOVE;
-            }
-            topY = visualTop - BUBBLE_PAD_Y;
-        }
-        int visualBottom = getDrawnLinePixelBottom(lineTop[b.end], cachedLines[b.end], isHeader[b.end]);
-        int bottomY = visualBottom + BUBBLE_PAD_Y;
-
-        if (bi + 1 < blocks.size()) {
-            int nextHeaderIndex = (int)blocks[bi + 1].start;
-            int nextTop = lineTop[nextHeaderIndex];
-            int maxBottom = nextTop - 1 - bubbleGapY;
-            if (bottomY > maxBottom)
-                bottomY = maxBottom;
-        }
-
-        if (bottomY <= topY + 2)
-            continue;
-
-        if (bottomY < contentTop || topY > contentBottom - 1)
-            continue;
-
-        int maxLineW = 0;
-
-        for (size_t i = b.start; i <= b.end; ++i) {
-            int w = 0;
-            if (isHeader[i]) {
-                w = display->getStringWidth(cachedLines[i].c_str());
-                if (b.mine)
-                    w += 12; // room for ACK/NACK/relay mark
-            } else {
-                w = getRenderedLineWidth(display, cachedLines[i], emotes, numEmotes);
-            }
-            if (w > maxLineW)
-                maxLineW = w;
-        }
-
-        int bubbleW = std::max(BUBBLE_MIN_W, maxLineW + (BUBBLE_PAD_X * 2));
-        int bubbleH = (bottomY - topY) + 1;
-        int bubbleX = 0;
-        if (b.mine) {
-            bubbleX = rightEdge - bubbleW;
-        } else {
-            bubbleX = x;
-        }
-        if (bubbleX < x)
-            bubbleX = x;
-        if (bubbleX + bubbleW > rightEdge)
-            bubbleW = std::max(1, rightEdge - bubbleX);
-
-        if (bubbleW > 1 && bubbleH > 1) {
-            int r = BUBBLE_RADIUS;
-            int maxR = (std::min(bubbleW, bubbleH) / 2) - 1;
-            if (maxR < 0)
-                maxR = 0;
-            if (r > maxR)
-                r = maxR;
-
-            drawRoundedRectOutline(display, bubbleX, topY, bubbleW, bubbleH, r);
-            const int extra = 3;
-            const int rr = r + extra;
-            int x1 = bubbleX + bubbleW - 1;
-            int y1 = topY + bubbleH - 1;
-
-            if (!b.mine) {
-                // top-left corner square
-                display->drawLine(bubbleX, topY, bubbleX + rr, topY);
-                display->drawLine(bubbleX, topY, bubbleX, topY + rr);
-            } else {
-                // bottom-right corner square
-                display->drawLine(x1 - rr, y1, x1, y1);
-                display->drawLine(x1, y1 - rr, x1, y1);
-            }
-        }
-    }
 
     // Render visible lines
-    int lineY = yOffset;
     for (size_t i = 0; i < cachedLines.size(); ++i) {
+        int lineY = yOffset;
+        for (size_t j = 0; j < i; ++j)
+            lineY += cachedHeights[j];
 
         if (lineY > -cachedHeights[i] && lineY < scrollBottom) {
             if (isHeader[i]) {
@@ -924,28 +728,14 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                 int headerX;
                 if (isMine[i]) {
                     // push header left to avoid overlap with scrollbar
-                    headerX = (SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN) - w - BUBBLE_TEXT_INDENT;
+                    headerX = SCREEN_WIDTH - w - SCROLLBAR_WIDTH - RIGHT_MARGIN;
                     if (headerX < LEFT_MARGIN)
                         headerX = LEFT_MARGIN;
                 } else {
-                    headerX = x + BUBBLE_TEXT_INDENT;
+                    headerX = x;
                 }
                 display->drawString(headerX, lineY, cachedLines[i].c_str());
 
-                // Draw underline just under header text
-                int underlineY = lineY + FONT_HEIGHT_SMALL;
-
-                int underlineW = w;
-                int maxW = rightEdge - headerX;
-                if (maxW < 0)
-                    maxW = 0;
-                if (underlineW > maxW)
-                    underlineW = maxW;
-
-                for (int px = 0; px < underlineW; ++px) {
-                    display->setPixel(headerX + px, underlineY);
-                }
-
                 // Draw ACK/NACK mark for our own messages
                 if (isMine[i]) {
                     int markX = headerX - 10;
@@ -963,27 +753,32 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
                     // AckStatus::NONE → show nothing
                 }
 
+                // Draw underline just under header text
+                int underlineY = lineY + FONT_HEIGHT_SMALL;
+                for (int px = 0; px < w; ++px) {
+                    display->setPixel(headerX + px, underlineY);
+                }
             } else {
                 // Render message line
                 if (isMine[i]) {
                     // Calculate actual rendered width including emotes
                     int renderedWidth = getRenderedLineWidth(display, cachedLines[i], emotes, numEmotes);
-                    int rightX = (SCREEN_WIDTH - SCROLLBAR_WIDTH - RIGHT_MARGIN) - renderedWidth - BUBBLE_TEXT_INDENT;
+                    int rightX = SCREEN_WIDTH - renderedWidth - SCROLLBAR_WIDTH - RIGHT_MARGIN;
                     if (rightX < LEFT_MARGIN)
                         rightX = LEFT_MARGIN;
 
                     drawStringWithEmotes(display, rightX, lineY, cachedLines[i], emotes, numEmotes);
                 } else {
-                    drawStringWithEmotes(display, x + BUBBLE_TEXT_INDENT, lineY, cachedLines[i], emotes, numEmotes);
+                    drawStringWithEmotes(display, x, lineY, cachedLines[i], emotes, numEmotes);
                 }
             }
         }
-
-        lineY += cachedHeights[i];
     }
+    int totalContentHeight = totalHeight;
+    int visibleHeight = usableHeight;
 
     // Draw scrollbar
-    drawMessageScrollbar(display, usableHeight, totalHeight, finalScroll, getTextPositions(display)[1]);
+    drawMessageScrollbar(display, visibleHeight, totalContentHeight, finalScroll, getTextPositions(display)[1]);
     graphics::drawCommonHeader(display, x, y, titleStr);
     graphics::drawCommonFooter(display, x, y);
 }
@@ -1046,6 +841,7 @@ std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, con
     constexpr int HEADER_UNDERLINE_GAP = 0; // space between underline and first body line
     constexpr int HEADER_UNDERLINE_PIX = 1; // underline thickness (1px row drawn)
     constexpr int BODY_LINE_LEADING = -4;   // default vertical leading for normal body lines
+    constexpr int MESSAGE_BLOCK_GAP = 4;    // gap after a message block before a new header
     constexpr int EMOTE_PADDING_ABOVE = 4;  // space above emote line (added to line above)
     constexpr int EMOTE_PADDING_BELOW = 3;  // space below emote line (added to emote line)
 
@@ -1055,7 +851,6 @@ std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, con
     for (size_t idx = 0; idx < lines.size(); ++idx) {
         const auto &line = lines[idx];
         const int baseHeight = FONT_HEIGHT_SMALL;
-        int lineHeight = baseHeight;
 
         // Detect if THIS line or NEXT line contains an emote
         bool hasEmote = false;
@@ -1077,6 +872,8 @@ std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, con
             }
         }
 
+        int lineHeight = baseHeight;
+
         if (isHeaderVec[idx]) {
             // Header line spacing
             lineHeight = baseHeight + HEADER_UNDERLINE_PIX + HEADER_UNDERLINE_GAP;
@@ -1125,7 +922,7 @@ void handleNewMessage(OLEDDisplay *display, const StoredMessage &sm, const mesht
 
         // Banner logic
         const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet.from);
-        char longName[48] = "?";
+        char longName[48] = "???";
         if (node && node->user.long_name) {
             strncpy(longName, node->user.long_name, sizeof(longName) - 1);
             longName[sizeof(longName) - 1] = '\0';

src/modules/NodeInfoModule.cpp

@@ -2,6 +2,7 @@
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
+#include "NodeStatus.h"
 #include "RTC.h"
 #include "Router.h"
 #include "configuration.h"
@@ -129,14 +130,17 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
         LOG_DEBUG("Skip send NodeInfo > 40%% ch. util");
         return NULL;
     }
-    // If we sent our NodeInfo less than 5 min. ago, don't send it again as it may be still underway.
-    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 5 * 60 * 1000)) {
-        LOG_DEBUG("Skip send NodeInfo since we sent it <5min ago");
+
+    // Use graduated scaling based on active mesh size (10 minute base, scales with congestion coefficient)
+    uint32_t timeoutMs = Default::getConfiguredOrDefaultMsScaled(0, 10 * 60, nodeStatus->getNumOnline());
+    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, timeoutMs)) {
+        LOG_DEBUG("Skip send NodeInfo since we sent it <%us ago", timeoutMs / 1000);
         ignoreRequest = true; // Mark it as ignored for MeshModule
         return NULL;
     } else if (shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 60 * 1000)) {
+        // For interactive/urgent requests (e.g., user-triggered or implicit requests), use a shorter 60s timeout
         LOG_DEBUG("Skip send NodeInfo since we sent it <60s ago");
-        ignoreRequest = true; // Mark it as ignored for MeshModule
+        ignoreRequest = true;
         return NULL;
     } else {
         ignoreRequest = false; // Don't ignore requests anymore

variants/esp32/chatter2/platformio.ini

@@ -6,6 +6,8 @@ build_flags =
   ${esp32_base.build_flags}
   -D CHATTER_2
   -I variants/esp32/chatter2
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
   
 lib_deps =
   ${esp32_base.lib_deps}

variants/esp32/m5stack_core/platformio.ini

@@ -16,6 +16,8 @@ build_flags =
   ${esp32_base.build_flags}
   -I variants/esp32/m5stack_core
   -DM5STACK
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
   -DUSER_SETUP_LOADED
   -DTFT_SDA_READ
   -DTFT_DRIVER=0x9341

variants/nrf52840/heltec_mesh_solar/platformio.ini

@@ -16,7 +16,7 @@ lib_deps =
   # renovate: datasource=git-refs depName=NMIoT-meshsolar packageName=https://github.com/NMIoT/meshsolar gitBranch=main
   https://github.com/NMIoT/meshsolar/archive/dfc5330dad443982e6cdd37a61d33fc7252f468b.zip
   # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
-  bblanchon/ArduinoJson@6.21.5
+  bblanchon/ArduinoJson@7.4.2
 
 [env:heltec-mesh-solar]
 custom_meshtastic_hw_model = 108

variants/nrf52840/rak4631_eth_gw/platformio.ini

@@ -36,7 +36,7 @@ lib_deps =
   # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
   https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
   # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
-  bblanchon/ArduinoJson@6.21.5
+  bblanchon/ArduinoJson@7.4.2
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
 ;upload_protocol = jlink

variants/stm32/russell/platformio.ini

@@ -1,21 +0,0 @@
-; Russell is a board designed to mount on an ER34615/IFR32700 cell and go Up! on a balloon
-; Hardware repository: https://github.com/Meshtastic-Malaysia/russell
-; - RAK3172 STM32WLE5CCU6 MCU + integrated SX1262 LoRa
-; - CDtop CD-PA1010D GPS
-; - Bosch Sensortec BME280 sensor
-; - Consonance CN3158 LiFePO4 solar charger
-[env:russell]
-extends = stm32_base
-board = wiscore_rak3172
-board_level = extra
-board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
-build_flags =
-  ${stm32_base.build_flags}
-  -Ivariants/stm32/russell
-  -DPRIVATE_HW
-lib_deps =
-  ${stm32_base.lib_deps}
-	# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
-	adafruit/Adafruit BME280 Library@2.3.0
-
-upload_port = stlink

variants/stm32/russell/rfswitch.h

@@ -1,7 +0,0 @@
-// Pins from https://forum.rakwireless.com/t/rak3172-internal-schematic/4557/2
-// PB8, PC13
-
-static const RADIOLIB_PIN_TYPE rfswitch_pins[5] = {PB8, PC13, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
-
-static const Module::RfSwitchMode_t rfswitch_table[4] = {
-    {STM32WLx::MODE_IDLE, {LOW, LOW}}, {STM32WLx::MODE_RX, {HIGH, LOW}}, {STM32WLx::MODE_TX_HP, {LOW, HIGH}}, END_OF_MODE_TABLE};

variants/stm32/russell/variant.h

@@ -1,41 +0,0 @@
-#ifndef _VARIANT_RUSSELL_
-#define _VARIANT_RUSSELL_
-
-#define USE_STM32WLx
-
-// I/O
-#define LED_PIN PA0 // Red LED
-#define LED_STATE_ON 1
-#define BUTTON_PIN PH3 // Shared with BOOT0
-#define BUTTON_NEED_PULLUP
-// Charger IC charge/standby pins are open-drain with no hardware pull-up:
-// Internal pull-up is needed on STM32 (TODO)
-// #define EXT_CHRG_DETECT PA5
-// #define EXT_PWR_DETECT PA4
-
-// Bosch Sensortec BME280
-#define HAS_SENSOR 1
-
-// CDtop CD-PA1010D
-#define ENABLE_HWSERIAL1
-#define PIN_SERIAL1_RX PB7
-#define PIN_SERIAL1_TX PB6
-#define HAS_GPS 1
-#define PIN_GPS_STANDBY PA15
-#define GPS_RX_PIN PB7
-#define GPS_TX_PIN PB6
-
-// LoRa
-/*
- * RAK3172   (-20–85°C) -> No TCXO
- * RAK3172-T (-40–85°C) -> 3.0V TCXO
- * https://github.com/RAKWireless/RAK-STM32-RUI/blob/e5a28be8fab1a492bd9223dd425ca33a8a297d90/variants/WisDuo_RAK3172-T_Board/radio_conf.h#L91
- */
-#define TCXO_OPTIONAL
-#define SX126X_DIO3_TCXO_VOLTAGE 3.0
-
-// Required to avoid Serial1 conflicts due to board definition here:
-// https://github.com/stm32duino/Arduino_Core_STM32/blob/main/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.h
-#define RAK3172
-
-#endif