Merge branch 'master' into T-beam-display-no-touch

.trunk/trunk.yaml

@@ -8,7 +8,7 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - renovate@39.238.1
+    - renovate@39.243.0
     - prettier@3.5.3
     - trufflehog@3.88.23
     - yamllint@1.37.0
@@ -28,7 +28,7 @@ lint:
     - shellcheck@0.10.0
     - black@25.1.0
     - git-diff-check
-    - gitleaks@8.24.2
+    - gitleaks@8.24.3
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

src/graphics/Screen.cpp

@@ -1833,7 +1833,9 @@ void Screen::setup()
     powerStatusObserver.observe(&powerStatus->onNewStatus);
     gpsStatusObserver.observe(&gpsStatus->onNewStatus);
     nodeStatusObserver.observe(&nodeStatus->onNewStatus);
+#if !MESHTASTIC_EXCLUDE_ADMIN
     adminMessageObserver.observe(adminModule);
+#endif
     if (textMessageModule)
         textMessageObserver.observe(textMessageModule);
     if (inputBroker)
@@ -2894,4 +2896,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
-#endif // HAS_SCREEN
+#endif // HAS_SCREEN

variants/tlora_v1/platformio.ini

@@ -3,4 +3,5 @@ board_level = extra
 extends = esp32_base
 board = ttgo-lora32-v1
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1
+  ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1
+upload_speed = 115200