fix(ui/screenlink): 按键应答扣到按键后画面,反馈典型 250-450 ms 降至 70-135 ms
按键召唤答的是按键前的旧帧:uiTask 还没消化键答案就发走了,新画面 只能等下一次周期召唤(280 ms/轮)才带得出——真机反馈 250-450 ms 的 主构成(根因账本 docs/子系统设计/屏板链路设计说明.md §7.1)。 改动(用户批准范围 A+B+C;屏板固件未动,决策三不变): - sb_link:按键召唤改为只入队不起发;uiTask 同拍重绘并组帧成功后交 凭据(sb_link_key_rendered),TIM3 1 kHz 的 sb_link_ms_tick 以 ≤1 ms 放行新帧。140 ms 截止(SB_KEY_RESP_MAX_MS,+59.6 ms 线上 <205 ms 屏板放弃线)保底发旧帧,"一召一答"契约不破;线忙时同旧丢单、 不留扣件。起发两中断源(USART1 IDLE/TIM3)共用 sb_tx_kick, "判忙→占位"在 PRIMASK 临界区原子完成。 - ui_task:排空注键挪到组帧之前,注键→即派即绘→组帧同拍闭环; 组帧返回 BSP_OK 才交重绘凭据(BUSY 拍帧还没反映按键)。 - ui_port:注键单槽改 8 深环(连按不再互相覆盖,满丢最旧+计数); 新增 ui_port_service_keys:同拍 lv_indev_read + lv_refr_now, 省掉 indev ≤20 ms + 刷新 ≤20 ms 两段等待。 - ui_menu_view:菜单移动选中只失效新旧两行带(黄金参考零像素变化), 滚动/异常回退整框失效。 - simulator:窗口循环 sleep 扣除本轮已耗时(原先无条件睡满 lv_timer_handler 返回值,叠加 Windows Sleep 15.6 ms 粒度放大观感)。 - 串口 TX 上报新增 dfok/dfold(凭据放行新帧数/超时保底旧帧数): dfold 连涨 = uiTask 被饿 ≥140 ms 的直接现场证据。 验证:test/host/sb_link 164/164(新增 18 条:不立刻起发/凭据放行/ 140 ms 截止保底/忙时不留扣件/陈旧凭据不放行等边界);菜单 8 状态 + 内容页 66 张黄金像素 PASS;Keil @build 0 错误 0 警告(两次); BOM 99 文件无漂移、代码规范、doc-links 本次文件零问题、cppcheck PASS。 文档:屏板规划文档已被主干收编进设计说明,延迟账本落 docs/子系统设计/屏板链路设计说明.md §7.1,并同步 §4 口径、§8 接口、 §9.1 单测台账 146→164、§10 坑账本补条。 RAM 台账(分支不跑 --write,并行分支提交约定):本笔盖戳行 RW_IRAM1 94,336 B (72.0%) / RW_CCM 57,376 B (87.9%),较上一台账行 +4,400 B——为距上次台账构建以来分支累计差(含批 3 状态灯等未盖戳 提交),非全部本笔引入;本次自身增量按对象计为 ui_port.o +12 B (8 深键环+丢计数+indev 指针)与 sb_link/o 数十字节级。 gate: only mem-budget/mem-numbers pending lead ledger backfill (合并落主干后 Lead 统一 --write 回填受管区)。
This commit is contained in:
@@ -48,6 +48,16 @@
|
||||
* TC-SBLINK-025 组帧耗时换算:周期数 → µs 的除数(SystemCoreClock/1e6)
|
||||
* TC-SBLINK-026 上报行:fb/tx 列可见;离线行排在周期行之前且不重复
|
||||
*
|
||||
* 覆盖点(2026-10-30 按键延迟整治:按键召唤延迟应答,
|
||||
* docs/子系统设计/屏板链路设计说明.md §7.1):
|
||||
* TC-SBLINK-030 按键召唤不立刻起发:扣住本答、键照常进队、不误记丢单
|
||||
* TC-SBLINK-031 放行链:画面更新 + 组帧 OK + key_rendered 凭据 → 下一拍发一帧、
|
||||
* dfok 计数、放行后不再复发的
|
||||
* TC-SBLINK-032 截止保底:uiTask 饿死时满 SB_KEY_RESP_MAX_MS 发旧帧、dfold 计数、
|
||||
* 窗口随即关闭
|
||||
* TC-SBLINK-033 边界四条:周期召唤不受影响 / 线忙丢单不留扣件 /
|
||||
* 新召唤清陈旧凭据 / 首帧未备时同旧丢单
|
||||
*
|
||||
* 通过:全部 TC PASS(main 返回 0)。
|
||||
* 入口:int main(void),返回 0=PASS / 1=FAIL(由 run 脚本判读)。
|
||||
*
|
||||
@@ -803,6 +813,137 @@ static void tc_tx_report(void)
|
||||
CHECK(sb_log_has(0U, "OFFLINE") == 1, "TC-SBLINK-026e ... and it is the offline one");
|
||||
}
|
||||
|
||||
/* ===================== 按键召唤延迟应答(2026-10-30) ===================== */
|
||||
|
||||
/* 模拟"TIM3 1 kHz 分支跑了 n 拍"(真机每拍必调 sb_link_ms_tick,见 Src/main.c) */
|
||||
static void run_ms_tick(uint32_t n)
|
||||
{
|
||||
uint32_t i;
|
||||
|
||||
for (i = 0U; i < n; i++) {
|
||||
sb_link_ms_tick();
|
||||
}
|
||||
}
|
||||
|
||||
static void tc_key_defer_fresh(void)
|
||||
{
|
||||
uint8_t f[SB_FRAME_A_LEN];
|
||||
sb_link_stats_t st;
|
||||
|
||||
(void)setup_link();
|
||||
fill_bmp(0xA1U);
|
||||
(void)sb_link_frame_update(s_bmp, 0U); /* 帧备好、线空闲 */
|
||||
|
||||
make_frame(f, 0x01U, 0x03U, SB_CMD_KEY, 3U); /* 屏板键 3 = DOWN */
|
||||
sb_tx_calls = 0U;
|
||||
feed(f, SB_FRAME_A_LEN);
|
||||
|
||||
/* 延迟应答的核心断言:按键召唤**不立刻起发**——立刻发的是按键**之前**的画面,
|
||||
* 这一答等于白发(用户看到变化还要再等一整轮召唤)。 */
|
||||
sb_link_get_stats(&st);
|
||||
CHECK(sb_tx_calls == 0U, "TC-SBLINK-030 key summon does not kick immediately");
|
||||
CHECK((st.tx_kick == 0U) && (st.tx_busy_drop == 0U),
|
||||
"TC-SBLINK-030b ... nothing sent and nothing dropped");
|
||||
CHECK(sb_link_key_take() == 3U, "TC-SBLINK-030c ... the key still enters the queue");
|
||||
|
||||
/* 任务侧的等效动作:画面变新 → 组帧 OK → 交凭据 → 下一拍放行 */
|
||||
s_bmp[7] ^= 0xFFU;
|
||||
(void)sb_link_frame_update(s_bmp, 0U);
|
||||
sb_link_key_rendered();
|
||||
sb_link_ms_tick();
|
||||
|
||||
sb_link_get_stats(&st);
|
||||
CHECK(sb_tx_calls == 1U, "TC-SBLINK-031a release sends exactly one frame");
|
||||
CHECK(st.defer_fresh == 1U, "TC-SBLINK-031b ... counted as a fresh release");
|
||||
CHECK(st.tx_kick == 1U, "TC-SBLINK-031c ... and counted as a normal kick");
|
||||
|
||||
/* 放行即销扣件:之后的拍不得再发("一召一答"不许变连发) */
|
||||
tx_complete();
|
||||
sb_link_ms_tick();
|
||||
CHECK(sb_tx_calls == 1U, "TC-SBLINK-031d ... and it does not fire again once released");
|
||||
}
|
||||
|
||||
static void tc_key_defer_timeout(void)
|
||||
{
|
||||
uint8_t f[SB_FRAME_A_LEN];
|
||||
sb_link_stats_t st;
|
||||
|
||||
(void)setup_link();
|
||||
fill_bmp(0xB2U);
|
||||
(void)sb_link_frame_update(s_bmp, 0U);
|
||||
|
||||
make_frame(f, 0x01U, 0x03U, SB_CMD_KEY, 2U);
|
||||
sb_tx_calls = 0U;
|
||||
feed(f, SB_FRAME_A_LEN);
|
||||
|
||||
/* uiTask 被饿(对时突发那类事故):一直不交凭据。到上限必须发旧帧保底——
|
||||
* 欠发会让屏板白等一整个 205 ms 重问窗口,而"答一帧旧画面"至少守住协议。 */
|
||||
run_ms_tick(SB_KEY_RESP_MAX_MS - 1U);
|
||||
CHECK(sb_tx_calls == 0U, "TC-SBLINK-032a still held one ms before the deadline");
|
||||
sb_link_ms_tick();
|
||||
sb_link_get_stats(&st);
|
||||
CHECK(sb_tx_calls == 1U, "TC-SBLINK-032b the deadline sends the old frame");
|
||||
CHECK(st.defer_old == 1U, "TC-SBLINK-032c ... counted as an old-frame release");
|
||||
|
||||
tx_complete();
|
||||
run_ms_tick(300U);
|
||||
CHECK(sb_tx_calls == 1U, "TC-SBLINK-032d ... and the deferred window is closed");
|
||||
}
|
||||
|
||||
static void tc_key_defer_rules(void)
|
||||
{
|
||||
uint8_t f[SB_FRAME_A_LEN];
|
||||
sb_link_stats_t st;
|
||||
|
||||
(void)setup_link();
|
||||
fill_bmp(0xC3U);
|
||||
(void)sb_link_frame_update(s_bmp, 0U);
|
||||
|
||||
/* ① 周期召唤不受影响:照旧立刻答(改动只收紧按键那一支) */
|
||||
make_frame(f, 0x01U, 0x03U, SB_CMD_RT, 0U);
|
||||
sb_tx_calls = 0U;
|
||||
feed(f, SB_FRAME_A_LEN);
|
||||
CHECK(sb_tx_calls == 1U, "TC-SBLINK-033a periodic summon still kicks at once");
|
||||
|
||||
/* ② 线忙时的按键召唤:同旧丢单,且**不留扣件**——扣一个没人应答过的召唤,
|
||||
* 等于下一拍凭空多发一帧(那轮召唤屏板早改口重问了)。 */
|
||||
tx_complete();
|
||||
feed(f, SB_FRAME_A_LEN); /* 再占上线 */
|
||||
make_frame(f, 0x01U, 0x03U, SB_CMD_KEY, 4U);
|
||||
sb_tx_calls = 0U;
|
||||
feed(f, SB_FRAME_A_LEN);
|
||||
sb_link_get_stats(&st);
|
||||
CHECK(sb_tx_calls == 0U, "TC-SBLINK-033b key summon while TX busy sends nothing");
|
||||
CHECK((st.defer_fresh == 0U) && (st.defer_old == 0U),
|
||||
"TC-SBLINK-033c ... and a busy drop leaves nothing deferred");
|
||||
tx_complete();
|
||||
run_ms_tick(3U);
|
||||
CHECK(sb_tx_calls == 0U, "TC-SBLINK-033d ... and it never invents a response later");
|
||||
|
||||
/* ③ 新按键召唤清掉上一拍的凭据:不得拿按键之前的重绘冒充"新帧已备好"秒放行 */
|
||||
(void)setup_link();
|
||||
fill_bmp(0xD4U);
|
||||
(void)sb_link_frame_update(s_bmp, 0U);
|
||||
sb_link_key_rendered(); /* 按键**之前**交的陈旧凭据 */
|
||||
make_frame(f, 0x01U, 0x03U, SB_CMD_KEY, 8U);
|
||||
sb_tx_calls = 0U;
|
||||
feed(f, SB_FRAME_A_LEN);
|
||||
sb_link_ms_tick();
|
||||
CHECK(sb_tx_calls == 0U, "TC-SBLINK-033e stale evidence does not release a new hold");
|
||||
|
||||
/* ④ 首帧还没组出来(刚上电):按键召唤同旧丢单、不扣件(没帧可扣) */
|
||||
(void)setup_link();
|
||||
make_frame(f, 0x01U, 0x03U, SB_CMD_KEY, 1U);
|
||||
sb_tx_calls = 0U;
|
||||
feed(f, SB_FRAME_A_LEN);
|
||||
sb_link_get_stats(&st);
|
||||
CHECK((sb_tx_calls == 0U) && (st.tx_busy_drop == 1U),
|
||||
"TC-SBLINK-033f key summon before the first frame still drops");
|
||||
tx_complete();
|
||||
run_ms_tick(3U);
|
||||
CHECK(sb_tx_calls == 0U, "TC-SBLINK-033g ... and never sends a frame that never existed");
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
printf("=== ScreenLink Link Tests ===\n");
|
||||
@@ -863,6 +1004,12 @@ int main(void)
|
||||
tc_frame_timing();
|
||||
printf("-- batch 2: TX report line --\n");
|
||||
tc_tx_report();
|
||||
printf("-- batch 3: key summon deferred answer --\n");
|
||||
tc_key_defer_fresh();
|
||||
printf("-- batch 3: deferred answer deadline --\n");
|
||||
tc_key_defer_timeout();
|
||||
printf("-- batch 3: deferred answer rules --\n");
|
||||
tc_key_defer_rules();
|
||||
|
||||
printf("\n=== ScreenLink Link Tests: %d/%d PASSED (failed=%d) ===\n",
|
||||
s_passed, s_total, s_failed);
|
||||
|
||||
@@ -108,6 +108,13 @@ typedef struct {
|
||||
volatile uint32_t ErrorCode;
|
||||
} UART_HandleTypeDef;
|
||||
|
||||
/* 关中断三件套(2026-10-30 sb_tx_kick 的原子占位闸用)。宿主单线程、没有真中断,
|
||||
* 空实现即可——临界区的"不交错"性质本来就不是本套件能测的面,逻辑面(busy/
|
||||
* frame_ready 闸门、扣件状态机、超时保底)全部照测。 */
|
||||
#define __get_PRIMASK() (0U)
|
||||
#define __disable_irq() ((void)0)
|
||||
#define __set_PRIMASK(x) ((void)(x))
|
||||
|
||||
/* ===== ③ 假 ReceiveToIdle_IT ===== */
|
||||
#define SB_FAKE_ARM_OK (0U)
|
||||
#define SB_FAKE_ARM_BUSY (1U)
|
||||
|
||||
Reference in New Issue
Block a user