From 531ac11c68a856537fc7e34891b24844d5cf493a Mon Sep 17 00:00:00 2001 From: feie9456 Date: Sat, 15 Nov 2025 15:47:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=E9=97=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index b280333..94c977f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,10 +5,10 @@ #include #include #include -#include #include #include #include +#include #include "ad7606.h" #include "init.h" #include "ui.h" @@ -96,8 +96,8 @@ static QueueHandle_t g_sampleQ = nullptr; // 队列元素:int16_t(CH0 原 // 采样任务:固定频率触发 AD7606 读取,推入队列 static void samplerTask(void* param) { - // 目标采样率(可按需调高/调低)。示例:1000Hz - const TickType_t period = pdMS_TO_TICKS(1); + // 目标采样率(可按需调高/调低)。 + const TickType_t period = pdMS_TO_TICKS(4); TickType_t last = xTaskGetTickCount(); for (;;) { int16_t s = ad7606::readCH0(); @@ -153,9 +153,9 @@ static void postRecording(AppState& s) { } payload += "]"; // 附带录制起止时间(毫秒) - payload += ",\"startTime\":"; + payload += ",\"recStartMs\":"; payload += String(s.recStartMs); - payload += ",\"endTime\":"; + payload += ",\"recEndMs\":"; payload += String(s.recEndMs); if (s.fitReady) { payload += ",\"fit\":{\"a\":"; @@ -190,11 +190,7 @@ static void postRecording(AppState& s) { } if (ok) { s.statusColor = GREEN; - if (idStr.length()) - snprintf(s.statusMsg, sizeof(s.statusMsg), "上传成功\nID:%s", - idStr.c_str()); - else - snprintf(s.statusMsg, sizeof(s.statusMsg), "上传成功"); + snprintf(s.statusMsg, sizeof(s.statusMsg), "上传成功"); s.statusUntilMs = millis() + 3000; } else { s.statusColor = RED; @@ -449,7 +445,8 @@ void setup() { // 创建采样队列与任务(将采样放到另一核,降低 UI 阻塞影响) g_sampleQ = xQueueCreate(2048, sizeof(int16_t)); // 在 Core 0 上跑采样任务,优先级略高于默认 - xTaskCreatePinnedToCore(samplerTask, "sampler", 4096, nullptr, 3, nullptr, 0); + xTaskCreatePinnedToCore(samplerTask, "sampler", 4096, nullptr, 3, nullptr, + 0); // 清空波形缓存并初始化计时 for (int i = 0; i < AppState::GraphW; ++i)