From 05e1c021281a675246fe749084b8ed6900d20f53 Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Thu, 8 Oct 2026 01:36:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E4=BB=B6=E9=BB=98=E8=AE=A4=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80=E6=94=B9=E4=B8=BA=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E6=9C=8D=E5=8A=A1=20https://cosmo.unisspace.com/api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- terminal/firmware/README.md | 18 +++++++++++------- .../firmware/cosmo_terminal/cosmo_terminal.ino | 2 +- .../firmware/cosmo_terminal/src/portal.cpp | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/terminal/firmware/README.md b/terminal/firmware/README.md index ef3b1ec..7b0a2cc 100644 --- a/terminal/firmware/README.md +++ b/terminal/firmware/README.md @@ -12,7 +12,7 @@ | LCD 复位·供电·背光 | 板上 XL9555 IO 扩展器(I2C:SDA=41 / SCL=42,地址 0x20) | | 按键 | KEY0..KEY3 走 XL9555(P1_4..P1_7),BOOT=GPIO0 | | 触摸 | **无**。这块 2.4 寸屏只有 ST7789V,没有触摸层 | -| 串口 | CH340 → `/dev/cu.usbserial-210`,115200 | +| 串口 | S3 原生 USB 口(USB-Serial/JTAG)→ `/dev/cu.usbmodem2101`,115200;CH340 UART 口 → `/dev/cu.usbserial-210`,取决于固件编译时的 USB Mode,见「构建 / 烧录」 | `WIRE_DC / LCD_DC` 跳线帽必须短接(SPI 模式),引脚集中在 `src/board_config.h`。 @@ -55,14 +55,18 @@ ```sh unset HTTP_PROXY HTTPS_PROXY http_proxy https_proxy # 本地代理端口是死的,会拖死下载 -FQBN='esp32:esp32:esp32s3:PSRAM=opi,FlashSize=16M,FlashMode=dio,CDCOnBoot=default,PartitionScheme=app3M_fat9M_16MB,UploadSpeed=460800' +FQBN='esp32:esp32:esp32s3:PSRAM=opi,FlashSize=16M,FlashMode=dio,USBMode=hwcdc,CDCOnBoot=cdc,PartitionScheme=app3M_fat9M_16MB,UploadSpeed=460800' ~/esp-tools/arduino-cli --config-file ~/esp-tools/arduino-cli.yaml compile --fqbn "$FQBN" terminal/firmware/cosmo_terminal -~/esp-tools/arduino-cli --config-file ~/esp-tools/arduino-cli.yaml upload --fqbn "$FQBN" --port /dev/cu.usbserial-210 terminal/firmware/cosmo_terminal +~/esp-tools/arduino-cli --config-file ~/esp-tools/arduino-cli.yaml upload --fqbn "$FQBN" --port /dev/cu.usbmodem2101 terminal/firmware/cosmo_terminal ``` - `PSRAM=opi` 必须开:帧缓冲(320x240x2 = 150KB)放在 PSRAM。 +- **USB 口选哪个决定串口在哪**:`USBMode=hwcdc,CDCOnBoot=cdc` = `Serial` 走 S3 原生 USB(USB-Serial/JTAG,`/dev/cu.usbmodem2101`), + 一根线同时能烧录和看日志/敲命令;换成 `CDCOnBoot=default`(=Disabled)则 `Serial` 落回 UART0/CH340, + 要用 `/dev/cu.usbserial-210`。两种 FQBN 都能烧录(USB-Serial/JTAG 自带下载模式),但只有前一种能在原生口拿到日志—— + 后面那种配 `tools/*.py` 得先把 `PORT` 改回 `usbserial-210`。 - 烧录速率用 460800;921600 在这块 CH340 上会 `Unable to verify flash chip connection`。 -- 分区表 `app3M_fat9M_16MB`:app 3MB,当前 `Sketch uses 1439650 bytes (45%)`(含内置图标 189KB + 中文字库 125KB)。 +- 分区表 `app3M_fat9M_16MB`:app 3MB,当前 `Sketch uses 1456603 bytes (46%)`(含内置图标 189KB + 中文字库 125KB)。 - 依赖:Arduino 核 `esp32:esp32 3.3.12` + `ArduinoJson 7.4.3`,其余都是核心自带库。 ## 界面:设计稿语言与离线资源 @@ -139,7 +143,7 @@ FQBN='esp32:esp32:esp32s3:PSRAM=opi,FlashSize=16M,FlashMode=dio,CDCOnBoot=defaul ```sh curl --noproxy '*' -H "Authorization: Bearer $TOK" -o /tmp/ic_599_40.bin \ - 'http://192.168.31.2:8000/api/terminal/bodies/599/icon?size=40' + 'https://cosmo.unisspace.com/api/terminal/bodies/599/icon?size=40' # 列表三张卡的图标左上角 = 13,32 / 13,97 / 13,162(40x40);详情 64x64 = 15,140 /usr/bin/python3 terminal/tools/fb_check.py /tmp/f_list --raw 13,32,40,/tmp/ic_599_40.bin ``` @@ -153,7 +157,7 @@ curl --noproxy '*' -H "Authorization: Bearer $TOK" -o /tmp/ic_599_40.bin \ 1. 手机/电脑连这个热点; 2. 浏览器打开 `http://192.168.4.1`(多数系统会自动弹出强制门户); -3. 选 SSID、填密码和后端地址(默认 `http://192.168.31.2:8000/api`),保存后自动重启。 +3. 选 SSID、填密码和后端地址(默认 `https://cosmo.unisspace.com/api`),保存后自动重启。 凭据、后端地址、token 都存在 NVS 命名空间 `cosmo`。 @@ -163,7 +167,7 @@ curl --noproxy '*' -H "Authorization: Bearer $TOK" -o /tmp/ic_599_40.bin \ ```c // cosmo_terminal.ino:26 -#define DEFAULT_API "http://192.168.31.2:8000/api" +#define DEFAULT_API "https://cosmo.unisspace.com/api" // 正式服务 ``` 换正式地址有三种改法,前两种不用重新烧录: diff --git a/terminal/firmware/cosmo_terminal/cosmo_terminal.ino b/terminal/firmware/cosmo_terminal/cosmo_terminal.ino index bdcc12b..ad9b2a1 100644 --- a/terminal/firmware/cosmo_terminal/cosmo_terminal.ino +++ b/terminal/firmware/cosmo_terminal/cosmo_terminal.ino @@ -23,7 +23,7 @@ #include "src/ui.h" #include "src/iconstore.h" -#define DEFAULT_API "http://192.168.31.2:8000/api" +#define DEFAULT_API "https://cosmo.unisspace.com/api" #define DEVICE_NAME "Cosmo Terminal" #define TOKEN_CAP 320 /* 后端下发的 terminal token 约 200 字符 */ diff --git a/terminal/firmware/cosmo_terminal/src/portal.cpp b/terminal/firmware/cosmo_terminal/src/portal.cpp index 79f68f4..cc62be3 100644 --- a/terminal/firmware/cosmo_terminal/src/portal.cpp +++ b/terminal/firmware/cosmo_terminal/src/portal.cpp @@ -19,7 +19,7 @@ static const char *PAGE_HEAD = static void handle_root() { char api[96] = {0}; - if (!store_get_str(K_API, api, sizeof(api))) strcpy(api, "http://192.168.31.2:8000/api"); + if (!store_get_str(K_API, api, sizeof(api))) strcpy(api, "https://cosmo.unisspace.com/api"); int n = WiFi.scanNetworks(); String opts;