Upgrade trunk (#10481 )

Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>
Update libch341-spi-userspace digest to 2e5ff75 (#10485 )
2026-10-12 14:51:18 +10:00 · 2026-05-15 20:03:50 -05:00 · 2026-05-15 19:30:04 -05:00 · 2026-05-15 05:59:15 -05:00 · 2026-05-14 06:43:06 -05:00 · 2026-05-13 09:27:05 -05:00
6 changed files with 32 additions and 18 deletions
@@ -8,17 +8,21 @@
  "features": {
    "ghcr.io/devcontainers/features/python:1": {
      "installTools": true,
-      "version": "3.14"
+      "version": "3.13"
    }
  },
  "customizations": {
    "vscode": {
      "extensions": [
        "ms-vscode.cpptools",
-        "platformio.platformio-ide",
+        "Jason2866.esp-decoder",
+        "pioarduino.pioarduino-ide",
        "Trunk.io"
      ],
-      "unwantedRecommendations": ["ms-azuretools.vscode-docker"],
+      "unwantedRecommendations": [
+        "ms-azuretools.vscode-docker",
+        "platformio.platformio-ide"
+      ],
      "settings": {
        "extensions.ignoreRecommendations": true
      }
@@ -4,11 +4,11 @@ cli:
 plugins:
  sources:
    - id: trunk
-      ref: v1.9.0
+      ref: v1.10.0
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.528
+    - checkov@3.2.529
    - renovate@43.150.0
    - prettier@3.8.3
    - trufflehog@3.95.3
@@ -16,7 +16,7 @@ lint:
    - bandit@1.9.4
    - trivy@0.70.0
    - taplo@0.10.0
-    - ruff@0.15.12
+    - ruff@0.15.13
    - isort@8.0.1
    - markdownlint@0.48.0
    - oxipng@10.1.1
@@ -1,10 +1,10 @@
 {
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
    "recommendations": [
-        "platformio.platformio-ide"
+        "Jason2866.esp-decoder",
+        "pioarduino.pioarduino-ide"
    ],
    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
+        "ms-vscode.cpptools-extension-pack",
+        "platformio.platformio-ide"
    ]
 }
@@ -27,6 +27,12 @@ ScreenResolution determineScreenResolution(int16_t screenheight, int16_t screenw
        return ScreenResolution::UltraLow;
    }

+#ifdef DISPLAY_FORCE_SMALL_FONTS
+    if (screenwidth <= 160 && screenheight <= 80) {
+        return ScreenResolution::Low;
+    }
+#endif
+
    // Standard OLED screens
    if (screenwidth > 128 && screenheight <= 64) {
        return ScreenResolution::Low;
@@ -291,10 +291,8 @@ static int32_t reconnectWiFi()
 #endif
        return 1000; // check once per second
    } else {
-#ifdef ARCH_RP2040
-        onNetworkConnected(); // will only do anything once
-#endif
-        return 300000; // every 5 minutes
+        onNetworkConnected(); // will only do anything once (guarded by APStartupComplete)
+        return 300000;        // every 5 minutes
    }
 }

@@ -343,9 +341,6 @@ bool initWifi()
        const char *wifiPsw = config.network.wifi_psk;

 #ifndef ARCH_RP2040
-#if !MESHTASTIC_EXCLUDE_WEBSERVER
-        createSSLCert(); // For WebServer
-#endif
        WiFi.persistent(false); // Disable flash storage for WiFi credentials
 #endif
        if (!*wifiPsw) // Treat empty password as no password
@@ -370,6 +365,9 @@ bool initWifi()
 #endif
            }
 #ifdef ARCH_ESP32
+            // Register WiFi event handler BEFORE createSSLCert() to prevent race condition:
+            // Without this, WiFi can auto-reconnect during cert generation and fire GOT_IP
+            // before the handler is registered, causing onNetworkConnected() to never run.
            WiFi.onEvent(WiFiEvent);
            WiFi.setAutoReconnect(true);
            WiFi.setSleep(false);
@@ -391,6 +389,12 @@ bool initWifi()
                    wifiDisconnectReason = info.wifi_sta_disconnected.reason;
                },
                WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
+#endif
+
+#ifndef ARCH_RP2040
+#if !MESHTASTIC_EXCLUDE_WEBSERVER
+            createSSLCert(); // For WebServer - called after WiFi.onEvent() to avoid race condition
+#endif
 #endif
            LOG_DEBUG("JOINING WIFI soon: ssid=%s", wifiName);
            wifiReconnect = new Periodic("WifiConnect", reconnectWiFi);
@@ -29,7 +29,7 @@ lib_deps =
  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
  lovyan03/LovyanGFX@1.2.21
  ; # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
-  https://github.com/pine64/libch341-spi-userspace/archive/23c42319a69cffcb65868e3c72e6bed83974a393.zip
+  https://github.com/pine64/libch341-spi-userspace/archive/2e5ff751d0c39667993df672cb683740ed5c9394.zip
  # renovate: datasource=custom.pio depName=adafruit/Adafruit seesaw Library packageName=adafruit/library/Adafruit seesaw Library
 	adafruit/Adafruit seesaw Library@1.7.9
  # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
Author	SHA1	Message	Date
github-actions[bot]andvidplace7	502c5af524	Upgrade trunk (#10481 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-05-15 20:03:50 -05:00
renovate[bot]	05707079bd	Update libch341-spi-userspace digest to 2e5ff75 (#10485 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-15 19:30:04 -05:00
Ben Meadors	1c05633fcd	Add more support for small fonts in screen resolution determination (#10480 )	2026-05-15 05:59:15 -05:00
github-actions[bot]andvidplace7	fce419b335	Upgrade trunk (#10476 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-05-14 06:43:06 -05:00
Ben Meadors	1ae4a538f5	Trunk	2026-05-13 09:27:05 -05:00
Andros Fenollosa	c756bbe2c1	Fix WiFi TCP/HTTP services not starting without USB serial connected (#10460 ) Move WiFi.onEvent(WiFiEvent) registration before createSSLCert() to prevent a race where the ESP32 auto-reconnects during cert generation and fires GOT_IP before the handler is attached, causing onNetworkConnected() to never run and the TCP/HTTP API services to never initialize when booting without USB serial. Also call onNetworkConnected() from reconnectWiFi() on all platforms (not just RP2040) as a safety net; it is already guarded by APStartupComplete so it only runs once.	2026-05-13 09:26:44 -05:00
Austin	4c3ba612bb	VSCode: Prepare for pioarduino transition (#10471 ) Start reccomending the pioarduino VS Code extension instead of the PlatformIO extension. pioarduino-based builds cannot complete correctly using the platformio extension. Normal platformio builds (nrf52, stm32) are unaffected//still work correctly. Devs may need to delete their ~.platformio and .pio directories once after install in order to build properly.	2026-05-13 09:25:11 -05:00
Ben MeadorsandCopilot Autofix powered by AI	59025e4820	Add initial support for Station G3 variant (#10457 ) * Add initial support for Station G3 variant * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-05-13 08:07:24 -05:00