- 修复GD32 OTA中继全程ring抑制问题:handleIdle起点reset()曾立即解除 taskEntry设置的suppressRingService(true),导致中继全程worker偷读OTA ACK/WAIT - 增加reset(bool release_ring_suppress)参数控制ring抑制释放时机 - 新增GD32 APP初始化状态可视化功能(配套GD32 1.5.34+): * 通过SPI 0xA3查询模块位图/关键失败位图/复位源 * /system/status接口新增gd32_init字段提供状态详情 * 支持故障码数组显示,前端可直接显示中文失败原因 - 添加GD32模块级故障码支持(配套GD32 1.5.36): * 解析INIT_STATUS响应中的fault_codes数组 * 每模块1B故障码,支持CANFD通道号显示 - 电机状态协议升级:STATUS DLC从32字节扩展到48字节, 二进制协议版本升级到v2,entry大小从76字节变为92字节 - 修复SPI响应类型表,将0xA3加入短响应和APP ISR快速响应类型
119 lines
3.5 KiB
C++
119 lines
3.5 KiB
C++
/*
|
||
* motor_state.cpp - GD32 多电机状态推送解析与缓存 (SPI TYPE 0xC5)
|
||
*/
|
||
#include "monitor/motor_state.h"
|
||
#include "monitor/spi_ring_cache.h"
|
||
|
||
#include <string.h>
|
||
|
||
namespace {
|
||
|
||
static SemaphoreHandle_t s_mux = nullptr;
|
||
static motor_state_table_t s_table = {};
|
||
|
||
} // namespace
|
||
|
||
bool onMotorStateEvent(const uint8_t *payload, size_t len)
|
||
{
|
||
if (payload == nullptr || len < MOTOR_PAGE_HEADER) {
|
||
return false;
|
||
}
|
||
|
||
const uint8_t page = payload[0];
|
||
const uint8_t total_pages = payload[1];
|
||
const uint8_t entry_count = payload[2];
|
||
const uint8_t active_cnt = payload[3];
|
||
|
||
if (page >= MOTOR_TOTAL_PAGES || total_pages == 0 || total_pages > MOTOR_TOTAL_PAGES) {
|
||
return false;
|
||
}
|
||
|
||
/* 验证长度足够容纳声明的 entry 数 */
|
||
const size_t expected = MOTOR_PAGE_HEADER + static_cast<size_t>(entry_count) * MOTOR_ENTRY_SIZE;
|
||
if (len < expected) {
|
||
return false;
|
||
}
|
||
|
||
ringCacheEnsureMux(&s_mux);
|
||
if (s_mux == nullptr) return false;
|
||
if (xSemaphoreTake(s_mux, pdMS_TO_TICKS(20)) != pdTRUE) return false;
|
||
|
||
/* page 0 时刷新全局字段。
|
||
* active 字节 bit7 = boot_active(总线上有电机在 BOOT,0x103 心跳),
|
||
* 低 7 位才是真实在线电机数。 */
|
||
if (page == 0) {
|
||
s_table.active_count = static_cast<uint8_t>(active_cnt & 0x7FU);
|
||
s_table.boot_active = (active_cnt & 0x80U) ? 1U : 0U;
|
||
}
|
||
|
||
/* 逐条解析 entry:node×channel 双键槽位,同节点号多通道互不覆盖 */
|
||
size_t offset = MOTOR_PAGE_HEADER;
|
||
for (uint8_t i = 0; i < entry_count; ++i) {
|
||
const uint8_t *e = &payload[offset];
|
||
const uint8_t node = e[0];
|
||
const uint8_t ch = e[1];
|
||
if (node < 1 || node > MOTOR_MAX_NODES || ch >= MOTOR_CHANNELS) {
|
||
offset += MOTOR_ENTRY_SIZE;
|
||
continue;
|
||
}
|
||
|
||
motor_slot_t &slot = s_table.slots[(node - 1) * MOTOR_CHANNELS + ch];
|
||
slot.node_id = node;
|
||
slot.channel = ch;
|
||
slot.online = e[2];
|
||
slot.dlc = e[3];
|
||
slot.rx_count = rdU32Le(&e[4]);
|
||
slot.seq = rdU32Le(&e[8]);
|
||
memcpy(slot.data, &e[12], MOTOR_STATUS_DLC);
|
||
/* v0.74: STATUS DLC 48,CONFIG 字段整体后移 16B */
|
||
slot.config_rx_count = rdU32Le(&e[60]);
|
||
slot.config_seq = rdU32Le(&e[64]);
|
||
memcpy(slot.config_data, &e[68], MOTOR_CONFIG_DLC);
|
||
|
||
offset += MOTOR_ENTRY_SIZE;
|
||
}
|
||
|
||
/* 统计有效槽位 */
|
||
uint8_t valid = 0;
|
||
for (uint8_t i = 0; i < MOTOR_MAX_SLOTS; ++i) {
|
||
if (s_table.slots[i].node_id != 0) valid++;
|
||
}
|
||
s_table.valid_slots = valid;
|
||
s_table.recv_ms = esp_timer_get_time() / 1000;
|
||
s_table.have_data = true;
|
||
|
||
xSemaphoreGive(s_mux);
|
||
return true;
|
||
}
|
||
|
||
bool getLatestMotorState(motor_state_table_t *out)
|
||
{
|
||
if (out == nullptr) return false;
|
||
ringCacheEnsureMux(&s_mux);
|
||
if (s_mux == nullptr) return false;
|
||
|
||
bool ok = false;
|
||
if (xSemaphoreTake(s_mux, pdMS_TO_TICKS(20)) == pdTRUE) {
|
||
if (s_table.have_data) {
|
||
*out = s_table;
|
||
ok = true;
|
||
}
|
||
xSemaphoreGive(s_mux);
|
||
}
|
||
return ok;
|
||
}
|
||
|
||
uint32_t motorStateAgeMs(void)
|
||
{
|
||
ringCacheEnsureMux(&s_mux);
|
||
if (s_mux == nullptr) return UINT32_MAX;
|
||
|
||
int64_t recv = 0;
|
||
bool have = false;
|
||
if (xSemaphoreTake(s_mux, pdMS_TO_TICKS(20)) == pdTRUE) {
|
||
have = s_table.have_data;
|
||
recv = s_table.recv_ms;
|
||
xSemaphoreGive(s_mux);
|
||
}
|
||
return ringCacheAgeMs(have, recv);
|
||
} |