Upgrade trunk

.gitattributes

@@ -1,5 +1,5 @@
 * text=auto eol=lf
-*.cmd text eol=crlf
+*.{cmd,[cC][mM][dD]} text eol=crlf
-*.bat text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
-*.ps1 text eol=crlf
+*.{ps1,[pP][sS]} text eol=crlf
 *.{sh,[sS][hH]} text eol=lf

.trunk/trunk.yaml

@@ -9,8 +9,8 @@ plugins:
 lint:
   enabled:
     - prettier@3.5.3
-    - trufflehog@3.88.16
+    - trufflehog@3.88.15
-    - yamllint@1.36.0
+    - yamllint@1.35.1
     - bandit@1.8.3
     - checkov@3.2.382
     - terrascan@1.19.9

boards/esp32-s3-pico.json

@@ -7,15 +7,13 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ESP32S3_DEV",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DBOARD_HAS_PSRAM"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
-    "psram_type": "qio",
     "hwids": [["0x303A", "0x1001"]],
     "mcu": "esp32s3",
     "variant": "esp32s3"

src/mesh/api/PacketAPI.cpp

@@ -89,20 +89,18 @@ bool PacketAPI::receivePacket(void)
 
 bool PacketAPI::sendPacket(void)
 {
-    if (server->available()) {
+    // fill dummy buffer; we don't use it, we directly send the fromRadio structure
-        // fill dummy buffer; we don't use it, we directly send the fromRadio structure
+    uint32_t len = getFromRadio(txBuf);
-        uint32_t len = getFromRadio(txBuf);
+    if (len != 0) {
-        if (len != 0) {
+        static uint32_t id = 0;
-            static uint32_t id = 0;
+        fromRadioScratch.id = ++id;
-            fromRadioScratch.id = ++id;
+        bool result = server->sendPacket(DataPacket<meshtastic_FromRadio>(id, fromRadioScratch));
-            bool result = server->sendPacket(DataPacket<meshtastic_FromRadio>(id, fromRadioScratch));
+        if (!result) {
-            if (!result) {
+            LOG_ERROR("send queue full");
-                LOG_ERROR("send queue full");
-            }
-            return result;
         }
-    }
+        return result;
-    return false;
+    } else
+        return false;
 }
 
 bool PacketAPI::notifyProgrammingMode(void)

variants/ME25LS01-4Y10TD/platformio.ini

@@ -12,4 +12,4 @@ lib_deps =
   ${nrf52840_base.lib_deps}
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil
-;upload_port = /dev/ttyACM1
+upload_port = /dev/ttyACM1

variants/ME25LS01-4Y10TD_e-ink/platformio.ini

@@ -16,4 +16,4 @@ lib_deps =
   zinggjm/GxEPD2@^1.6.2
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil
-;upload_port = /dev/ttyACM1
+upload_port = /dev/ttyACM1

variants/MS24SF1/platformio.ini

@@ -12,4 +12,4 @@ lib_deps =
   ${nrf52840_base.lib_deps}
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil
-;upload_port = /dev/ttyACM1
+upload_port = /dev/ttyACM1

variants/crowpanel-esp32s3-5-epaper/platformio.ini

@@ -6,7 +6,7 @@ board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
 board = esp32-s3-devkitc-1
-;upload_port = /dev/ttyUSB0
+upload_port = /dev/ttyUSB0
 board_level = extra
 upload_protocol = esptool
 build_flags = 
@@ -33,7 +33,7 @@ board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
 board = esp32-s3-devkitc-1
-;upload_port = /dev/ttyUSB0
+upload_port = /dev/ttyUSB0
 board_level = extra
 upload_protocol = esptool
 build_flags = 
@@ -60,7 +60,7 @@ board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
 board = esp32-s3-devkitc-1
-;upload_port = /dev/ttyUSB0
+upload_port = /dev/ttyUSB0
 board_level = extra
 upload_protocol = esptool
 build_flags =