固件 C2:OTA 双槽 + 失败回滚(已上板实测正常 / 哈希错 / 回滚三条路径)
- 分区重排(16 MB,nvs 0x9000 不动):ota_0 / ota_1 各 3 MB、otadata 0x610000、evlog 挪到 0x612000;
flash 大小改正为 16 MB;开 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE
- ota.{h,c}(宿主机可测):URL / sha256 校验、判定(下载中 busy、待验证拒、同镜像不重下)、健康判据
- ota_esp.{h,c}:t_ota 任务经 HTTP 下载、边下边算 sha256、核 project_name 后切启动分区;
新固件 120 s 内连不上 broker 就回滚(t_link 判 + esp_timer 兜底);重启前等回应发出、事件落盘
- 新命令 ota = 13(两条链路都收,reboot 默认 false:复位 = 五台手机断电一次);status 加 ota 一块;
新事件 LOG_EV_OTA = 18;PROJECT_VER 取 PHONERAIL_FW_VERSION
- test_ota.c 13 例,全工程 442 例全绿;版本 0.1.0-c2
- 服务器:nginx 7765 只放行 /fw/<16 hex>.bin(不过门户,路由器转发已加);tools/ota_push.py 推送;
rack protocol.py 加事件 18 / 命令 13(已部署)
- 板 B:推送到自证健康 19 s;错哈希不切分区;删掉 broker 账号后 120 s 回滚,bad 报出被回滚的版本
Co-Authored-By: Claude Opus 5.5 <[email protected]>
这个提交包含在:
@@ -9,6 +9,7 @@
|
||||
#include "cmd_priv.h"
|
||||
#include "evlog.h"
|
||||
#include "hal_time.h"
|
||||
#include "ota.h"
|
||||
#include "pca9555.h"
|
||||
#include "phonerail.h"
|
||||
#include "rail.h"
|
||||
@@ -18,6 +19,35 @@
|
||||
|
||||
static const char *b(bool v) { return v ? "true" : "false"; }
|
||||
|
||||
/* C2:`"ota":{"st":"dl","got":N,"size":N,"err":null,"pend":false,"bad":null}`。
|
||||
`err` 是上一次失败的原因(成功 / 没做过是 null);`pend` = 正在跑的固件还没自证健康;
|
||||
`bad` = 被判无效、回滚掉的那份固件的版本号。版本号来自镜像头,按 ASCII 过滤一遍再写。 */
|
||||
static void ota_obj(cj_writer_t *w)
|
||||
{
|
||||
ota_status_t st;
|
||||
ota_status_get(&st);
|
||||
cj_w(w, ",\"ota\":{\"st\":\"%s\",\"got\":%lu,\"size\":%lu,\"err\":", ota_phase_str(st.phase),
|
||||
(unsigned long)st.got, (unsigned long)st.size);
|
||||
if (st.err == OTA_E_NONE) {
|
||||
cj_w(w, "null");
|
||||
} else {
|
||||
cj_w(w, "\"%s\"", ota_err_str(st.err));
|
||||
}
|
||||
cj_w(w, ",\"pend\":%s,\"bad\":", b(st.pending));
|
||||
if (st.bad[0] == '\0') {
|
||||
cj_w(w, "null}");
|
||||
return;
|
||||
}
|
||||
char v[sizeof(st.bad)];
|
||||
size_t n = 0;
|
||||
for (const char *s = st.bad; *s != '\0' && n < sizeof(v) - 1; s++) {
|
||||
const unsigned char ch = (unsigned char)*s;
|
||||
v[n++] = (ch < 0x20 || ch >= 0x7F || ch == '"' || ch == '\\') ? '?' : (char)ch;
|
||||
}
|
||||
v[n] = '\0';
|
||||
cj_w(w, "\"%s\"}", v);
|
||||
}
|
||||
|
||||
static void rail_obj(cj_writer_t *w, int rail, const safety_snap_t *s)
|
||||
{
|
||||
const int i = rail - 1;
|
||||
@@ -95,6 +125,7 @@ void cmd_report_status(cj_writer_t *w, const cmd_env_t *env)
|
||||
(unsigned long)s->cycles, (unsigned long)s->skipped,
|
||||
(unsigned long)s->i2c_errors, (unsigned long)s->events);
|
||||
}
|
||||
ota_obj(w);
|
||||
evlog_stats_t es;
|
||||
evlog_stats(&es);
|
||||
cmd_stats_t cs;
|
||||
|
||||
在新工单中引用
屏蔽一个用户