Merge branch 'master' into crowpanelV2

.github/workflows/docker_build.yml

@@ -69,7 +69,7 @@ jobs:
         uses: docker/setup-qemu-action@v4
 
       - name: Docker setup
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Sanitize platform string
         id: sanitize_platform
@@ -78,7 +78,7 @@ jobs:
 
       - name: Docker tag
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: meshtastic/meshtasticd
           tags: |
@@ -86,7 +86,7 @@ jobs:
           flavor: latest=false
 
       - name: Docker build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         id: docker_variant
         with:
           context: .

.github/workflows/docker_manifest.yml

@@ -146,7 +146,7 @@ jobs:
 
       - name: Docker meta (Debian)
         id: meta_debian
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: meshtastic/meshtasticd
           tags: |
@@ -167,7 +167,7 @@ jobs:
 
       - name: Docker meta (Alpine)
         id: meta_alpine
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: meshtastic/meshtasticd
           tags: |

.trunk/trunk.yaml

@@ -8,19 +8,19 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.506
-    - renovate@43.52.0
+    - checkov@3.2.507
+    - renovate@43.57.0
     - prettier@3.8.1
-    - trufflehog@3.93.6
+    - trufflehog@3.93.7
     - yamllint@1.38.0
     - bandit@1.9.4
     - trivy@0.69.3
     - taplo@0.10.0
-    - ruff@0.15.4
+    - ruff@0.15.5
     - isort@8.0.1
     - markdownlint@0.48.0
     - oxipng@10.1.0
-    - svgo@4.0.0
+    - svgo@4.0.1
     - actionlint@1.7.11
     - flake8@7.3.0
     - hadolint@2.14.0

src/mesh/generated/meshtastic/portnums.pb.h

@@ -140,6 +140,9 @@ typedef enum _meshtastic_PortNum {
     meshtastic_PortNum_MAP_REPORT_APP = 73,
     /* PowerStress based monitoring support (for automated power consumption testing) */
     meshtastic_PortNum_POWERSTRESS_APP = 74,
+    /* LoraWAN Payload Transport
+ ENCODING: compact binary LoRaWAN uplink (10-byte RF metadata + PHY payload) - see LoRaWANBridgeModule */
+    meshtastic_PortNum_LORAWAN_BRIDGE = 75,
     /* Reticulum Network Stack Tunnel App
  ENCODING: Fragmented RNS Packet. Handled by Meshtastic RNS interface */
     meshtastic_PortNum_RETICULUM_TUNNEL_APP = 76,

src/platform/nrf52/architecture.h

@@ -157,7 +157,7 @@
 
 #endif
 
-#ifdef PIN_LED1
+#if defined(PIN_LED1) && !defined(LED_POWER)
 #define LED_POWER PIN_LED1 // LED1 on nrf52840-DK
 #endif
 

variants/esp32s3/ELECROW-ThinkNode-M2/variant.h

@@ -1,6 +1,3 @@
-// Status
-#define LED_POWER 1
-
 #define PIN_BUTTON1 47 // 功能键
 #define PIN_BUTTON2 4  // 电源键
 #define ALT_BUTTON_PIN PIN_BUTTON2

variants/nrf52840/ELECROW-ThinkNode-M1/variant.cpp

@@ -32,8 +32,8 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    pinMode(PIN_LED1, OUTPUT);
-    ledOff(PIN_LED1);
+    // pinMode(PIN_LED1, OUTPUT);
+    // ledOff(PIN_LED1);
 }
 
 void variant_shutdown()

variants/nrf52840/ELECROW-ThinkNode-M1/variant.h

@@ -42,15 +42,17 @@ extern "C" {
 #define NUM_ANALOG_OUTPUTS (0)
 
 // LED
-#define PIN_LED1 (32 + 6) // red
-#define LED_POWER (32 + 4)
+// #define PIN_LED1 (32 + 6)
+#define LED_POWER (32 + 4)        // red
 #define LED_NOTIFICATION (0 + 13) // green
+#define POWER_LED_HARDWARE_BLINKS_WHILE_CHARGING
+
 // USB_CHECK
 #define EXT_PWR_DETECT (32 + 3)
 #define ADC_V (0 + 8)
 
-#define LED_BLUE PIN_LED1
-#define LED_STATE_ON 0 // State when LED is lit  // LED灯亮时的状态
+// #define LED_BLUE PIN_LED1
+#define LED_STATE_ON 1 // State when LED is lit  // LED灯亮时的状态
 #define PIN_BUZZER (0 + 6)
 /*
  * Buttons