Update ME25LS01/MS24SF1 comment out upload port (#6285 )

* Update platformio.ini * Update platformio.ini * Update platformio.ini
Upgrade trunk (#6283 )
2025-10-05 14:35:52 +00:00 · 2025-03-11 14:56:12 +02:00 · 2025-03-11 06:26:45 -05:00 · 2025-03-11 13:11:11 +02:00
5 changed files with 8 additions and 6 deletions
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@ -16,7 +16,7 @@ lint:
    - terrascan@1.19.9
    - trivy@0.60.0
    - taplo@0.9.3
-    - ruff@0.9.9
+    - ruff@0.9.10
    - isort@6.0.1
    - markdownlint@0.44.0
    - oxipng@9.1.4
--- a/boards/esp32-s3-pico.json
+++ b/boards/esp32-s3-pico.json
@ -7,13 +7,15 @@
    "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"
--- a/variants/ME25LS01-4Y10TD/platformio.ini
+++ b/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
--- a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
+++ b/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
--- a/variants/MS24SF1/platformio.ini
+++ b/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
Author	SHA1	Message	Date
Mark Trevor Birss	cb6dfb66d2	Update ME25LS01/MS24SF1 comment out upload port (#6285 ) Some checks are pending CI / build-esp32 (push) Blocked by required conditions Details CI / build-esp32-s3 (push) Blocked by required conditions Details CI / build-esp32-c3 (push) Blocked by required conditions Details CI / build-esp32-c6 (push) Blocked by required conditions Details CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / build-debian-src (push) Waiting to run Details CI / package-pio-deps-native-tft (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-debian-amd64 (push) Waiting to run Details CI / docker-alpine-amd64 (push) Waiting to run Details CI / docker-debian-arm64 (push) Waiting to run Details CI / docker-debian-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details * Update platformio.ini * Update platformio.ini * Update platformio.ini	2025-03-11 14:56:12 +02:00
github-actions[bot]	8795a63427	Upgrade trunk (#6283 ) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>	2025-03-11 06:26:45 -05:00
Mark Trevor Birss	186e509607	Update esp32-s3-pico.json (#6284 ) * Update esp32-s3-pico.json * Update esp32-s3-pico.json	2025-03-11 13:11:11 +02:00