- 添加DATA_READY引脚(GPIO10)支持5-wire SPI拓扑 - 将otaTransfer调用替换为更通用的transact方法 - 更新SPI引脚定义和通信协议文档 - 修改README.md详细说明新的SPI Link v2协议 docs: 标记旧版OTA中继设计文档为已废弃 - 在esp32_ota_relay_design.md添加废弃警告 - 指向新的SPI Link v2协议文档作为权威来源 - 保留历史文档供参考但停止维护 refactor(can): 增强CANFD桥接错误处理机制 - 扩展canFdSend函数增加gd32_err_out参数 - 透传GD32细分错误码(0xE0-0xE5)到HTTP响应 - 更新HTTP处理器输出完整的错误信息 perf(monitor): 优化按铃事件等待机制 - 修改can_feedback_task.cpp中的事件等待逻辑 - 统一使用takeEvent方法替代checkGd32Request - 减少不必要的中间变量和函数调用 fix(status): 改进系统状态监控和CPU使用率统计 - 增加CPU任务快照缓冲区容量从16到32 - 添加CPU统计无效时的调试日志输出 - 更新SPI Link统计接口使用新的linkStatus方法 refactor(ota): 优化OTA中继传输和启动等待逻辑 - 调整APP启动等待重试策略(10次->20次, 500ms->300ms) - 移除数据包传输进度的日志输出减少冗余信息 - 统一使用transact方法进行SPI事务处理 bump(version): 更新固件版本到0.3.44 - 版本号从0.3.43提升至0.3.44 - 更新编译时间和Git哈希值
176 lines
5.8 KiB
C++
176 lines
5.8 KiB
C++
/*
|
||
* can_feedback_task.cpp - 被动监听 GD32 主动推送的 CAN 反馈快照
|
||
*
|
||
* 架构(GD32 主动推送,ESP32 被动接收):
|
||
* GD32 APP 在主循环中调用 canFeedbackPushStep(),循环遍历 3 通道 × 2 页,
|
||
* 通过 requestEsp32Read(0xC1) 下拉 SPIready 主动按铃,将每页反馈 payload
|
||
* 推送给 ESP32。ESP32 本任务调用 checkGd32Request() 阻塞等待按铃,读到
|
||
* 一帧后用 canFdParseFeedbackPage() 解析并累积到 s_work[channel],再
|
||
* publish() 到 s_latest[channel] 供 Web/WebSocket 读取。
|
||
*
|
||
* 替代了原先 ESP32 1Hz 主动发 0xC1 轮询的逻辑,避免占用主线 SPI 带宽。
|
||
*
|
||
* OTA 期间通过 pauseCanFeedbackTask(true) 暂停本任务,避免与 OTA 抢占 SPI。
|
||
*/
|
||
#include "freertos/FreeRTOS.h"
|
||
#include "freertos/task.h"
|
||
#include "freertos/semphr.h"
|
||
|
||
#include "transport/canfd_bridge.h"
|
||
#include "transport/spi_master.h"
|
||
#include "monitor/debug_log.h"
|
||
#include "monitor/can_feedback_task.h"
|
||
|
||
#include <string.h>
|
||
|
||
namespace {
|
||
|
||
constexpr uint32_t kWaitRingMs = 500U; ///< 单次等待 GD32 按铃超时
|
||
constexpr uint32_t kPauseDelayMs = 100U; ///< 暂停时的轮询间隔
|
||
constexpr uint8_t kSpiCanFeedbackType = 0xC1U;
|
||
constexpr size_t kRingPayloadMax = SPI_OTA_FRAME_MAX; ///< 与变长读一致,避免截断
|
||
constexpr const char *kTag = "CAN_FB";
|
||
|
||
static can_feedback_result_t s_latest[CAN_CHANNEL_MAX];
|
||
static bool s_valid [CAN_CHANNEL_MAX];
|
||
static SemaphoreHandle_t s_mutex = nullptr;
|
||
static volatile bool s_paused = false;
|
||
|
||
/* 累积工作缓冲:跨 page 0/1 累积每通道的完整反馈 */
|
||
static can_feedback_result_t s_work [CAN_CHANNEL_MAX];
|
||
static uint8_t s_workIdx[CAN_CHANNEL_MAX];
|
||
static uint32_t s_lastLoggedError[CAN_CHANNEL_MAX];
|
||
|
||
static void publish(uint8_t ch, const can_feedback_result_t &fb)
|
||
{
|
||
if (s_mutex == nullptr) return;
|
||
if (xSemaphoreTake(s_mutex, pdMS_TO_TICKS(50)) == pdTRUE) {
|
||
s_latest[ch] = fb;
|
||
s_valid[ch] = true;
|
||
xSemaphoreGive(s_mutex);
|
||
}
|
||
}
|
||
|
||
static void taskLoop(void *)
|
||
{
|
||
DEBUG_INFO(kTag, "CAN 反馈被动监听任务启动 (GD32 主动推送, 0xC1)");
|
||
|
||
uint8_t ring_type = 0U;
|
||
uint8_t ring_payload[kRingPayloadMax] = {};
|
||
size_t ring_len = 0U;
|
||
|
||
for (;;) {
|
||
if (s_paused) {
|
||
vTaskDelay(pdMS_TO_TICKS(kPauseDelayMs));
|
||
continue;
|
||
}
|
||
|
||
/* 阻塞等待 GD32 按铃事件(超时则重试) */
|
||
if (!SpiMaster::instance().takeEvent(&ring_type, ring_payload,
|
||
sizeof(ring_payload), &ring_len,
|
||
kWaitRingMs)) {
|
||
continue;
|
||
}
|
||
|
||
if (ring_type != kSpiCanFeedbackType || ring_len < 28U) {
|
||
continue;
|
||
}
|
||
|
||
const uint8_t ch = ring_payload[0];
|
||
if (ch >= CAN_CHANNEL_MAX) {
|
||
continue;
|
||
}
|
||
|
||
/* 解析本页并累积到工作缓冲,page=0 会自动重置 */
|
||
if (canFdParseFeedbackPage(ring_payload, ring_len,
|
||
&s_work[ch], &s_workIdx[ch]) == 0) {
|
||
publish(ch, s_work[ch]);
|
||
|
||
/* 累计错误发生变化时才告警一次;P0/P1 携带相同统计,不能重复打印。 */
|
||
if (s_work[ch].stats.error_count != 0U
|
||
&& s_work[ch].stats.error_count != s_lastLoggedError[ch]) {
|
||
DEBUG_WARN(kTag,
|
||
"CH%u seq=%lu err=%lu TEC=%u REC=%u state=0x%02X",
|
||
static_cast<unsigned>(ch),
|
||
static_cast<unsigned long>(s_work[ch].stats.snapshot_seq),
|
||
static_cast<unsigned long>(s_work[ch].stats.error_count),
|
||
static_cast<unsigned>(s_work[ch].stats.tec),
|
||
static_cast<unsigned>(s_work[ch].stats.rec),
|
||
static_cast<unsigned>(s_work[ch].stats.bus_state));
|
||
s_lastLoggedError[ch] = s_work[ch].stats.error_count;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
} // namespace
|
||
|
||
/**
|
||
* @brief 启动 CAN 反馈被动监听任务(幂等)。
|
||
* @return true 表示任务已存在或创建成功。
|
||
*/
|
||
bool startCanFeedbackTask()
|
||
{
|
||
static bool s_started = false;
|
||
if (s_started) return true;
|
||
|
||
if (s_mutex == nullptr) {
|
||
s_mutex = xSemaphoreCreateMutex();
|
||
if (s_mutex == nullptr) {
|
||
DEBUG_ERR(kTag, "互斥量创建失败");
|
||
return false;
|
||
}
|
||
}
|
||
memset(s_latest, 0, sizeof(s_latest));
|
||
memset(s_lastLoggedError, 0, sizeof(s_lastLoggedError));
|
||
memset(s_valid, 0, sizeof(s_valid));
|
||
memset(s_work, 0, sizeof(s_work));
|
||
memset(s_workIdx, 0, sizeof(s_workIdx));
|
||
|
||
BaseType_t xRet = xTaskCreatePinnedToCore(
|
||
taskLoop,
|
||
"can_fb",
|
||
4096,
|
||
nullptr,
|
||
4,
|
||
nullptr,
|
||
0);
|
||
if (xRet != pdPASS) {
|
||
DEBUG_ERR(kTag, "任务创建失败");
|
||
return false;
|
||
}
|
||
s_started = true;
|
||
return true;
|
||
}
|
||
|
||
void pauseCanFeedbackTask(bool pause)
|
||
{
|
||
if (s_paused == pause) return; // 幂等:状态未变时不重复日志
|
||
s_paused = pause;
|
||
if (pause) {
|
||
DEBUG_INFO(kTag, "CAN 监听已暂停(OTA 进行中)");
|
||
} else {
|
||
DEBUG_INFO(kTag, "CAN 监听已恢复");
|
||
}
|
||
}
|
||
|
||
/**
|
||
* @brief 拷贝某通道的最新快照(线程安全)。
|
||
* @return true 表示拿到一份有效数据。
|
||
*/
|
||
bool getLatestCanFeedback(uint8_t channel, can_feedback_result_t *out)
|
||
{
|
||
if (channel >= CAN_CHANNEL_MAX || out == nullptr || s_mutex == nullptr) {
|
||
return false;
|
||
}
|
||
bool ok = false;
|
||
if (xSemaphoreTake(s_mutex, pdMS_TO_TICKS(50)) == pdTRUE) {
|
||
if (s_valid[channel]) {
|
||
*out = s_latest[channel];
|
||
ok = true;
|
||
}
|
||
xSemaphoreGive(s_mutex);
|
||
}
|
||
return ok;
|
||
}
|