FC协议(0827 docx): - 控制指令域:字节12,13/16,17由纵倾/横倾姿态数据2改为预留(编码恒0、解码忽略) - 状态反馈域:字节147,148由预留12改为剩余发电量(MWh),贯通JSON/网页显示 - PM→CCU链路:姿态字段4xuchar改为2xshort(数据1),结构体大小与线上布局不变 - 同步更新:CCU转发映射、SnapshotBuilder、pCCU网页、fuelcell网页、SQLite列描述、单测/模拟器 - 修正集成测试遗留断言(20B→24B、心跳d[19]→d[23])并增强预留字节校验 CCU地址可配置: - pPowerManger 支持 moos 配置项 ccuhost/ccuport(默认127.0.0.1:7000) - build-board.sh 增加 --ccu-host/--ccu-port 参数 文档:FC协议文档更新为0827版,清理过期协议docx
This commit is contained in:
+1
-3
@@ -218,15 +218,13 @@ void CCU::handlePmMessage(Message* msg, const std::vector<uint8_t>& frame) {
|
||||
LOG_F(INFO, "[PM] control: mode=%d cmd=%d power=%d",
|
||||
c.mode, c.cmd, c.outputPower);
|
||||
|
||||
// 映射并转发到 FC(1.1.1:姿态为双通道 int16,PM 单通道填数据1)
|
||||
// 映射并转发到 FC(0827协议:姿态仅数据1有效,数据2字节预留填0)
|
||||
FcControlValue f;
|
||||
f.mode = c.mode;
|
||||
f.cmd = c.cmd;
|
||||
f.outputPower = c.outputPower;
|
||||
f.pitch1 = c.pitch;
|
||||
f.pitch2 = 0;
|
||||
f.roll1 = c.roll;
|
||||
f.roll2 = 0;
|
||||
f.emergencyAllow = c.emergencyAllow;
|
||||
f.depth = c.depth;
|
||||
f.supplyCmd = c.supplyCmd;
|
||||
|
||||
Reference in New Issue
Block a user