feat(ui): add DI/DO status page showing 8 inputs and 4 outputs
New read-only content page under 实时数据 → 开入开出 showing the board's
8 opto inputs (DI_A..DI_H, 合/分) and 4 relay outputs (KO6/TRIP/ERT/CLZ,
吸合/释放) as a 12-row list, 8 rows per page, 2 pages.
Data path reuses the existing de-bounced input poll instead of adding a
second hardware reader:
defaultTask (50 ms) → ioboard_di_snap_publish() → de-bounced snapshot
→ ioboard_di_snap_lookup() [new registration channel]
→ ui_data_feed_tick() (uiTask, 200 ms)
→ ui_data_rt_t.dio_di_* / dio_do_*
No new critical sections, no new hardware access on the UI path. Outputs
come from the volatile shadow register (a memory read, no lock).
Semantic honesty, recorded in ui_page_di_do.c and README §6:
· Output state is the software shadow register (ODR mirror), NOT a
mechanical contact feedback — this platform has no auxiliary contact
readback path. ioboard_do_read_level() also reads ODR, so comparing
the two is tautological.
· IOBOARD_DO_LEVEL_ACTIVE polarity has not been checked against the
schematic.
· Input bit order has not been verified by manual shorting. The
2026-11-16 run read 0x00 eight times because the operator had no time
to short each channel — the data path itself was fine.
· Board-level inputs are deliberately kept out of the 33-point telemetry
bitmap (IEC 104 point-table semantics); the two have no mapping.
Invalid snapshots render "--", never 合/分 or 吸合/释放: painting "no data"
as "all inputs released" would tell the field the inputs are open when we
simply failed to read them.
Board-verified 2026-11-16: page 1 shows 分 on all 8 inputs, page 2 shows
释放 on all 4 outputs, page footer and paging correct. Input bit order
still pending manual shorting.
Also: regenerate ui_font_cn_12 for 吸/释, add golden references for both
pages, align check_menu_rows.py L2 geometry with the now-4-item submenu,
and register the new source file in both the Keil project and CMake.
Reviewed independently; zero blocking findings.
This commit is contained in:
+51
-1
@@ -1,6 +1,8 @@
|
||||
/*
|
||||
* 模块名称:开入(DI)去抖与快照——纯逻辑实现(本模块可主机侧测试的那一半)
|
||||
* 模块功能:ioboard_di.h 全部纯函数。零 HAL、零 FreeRTOS、零全局可变状态,
|
||||
* 模块功能:ioboard_di.h 全部纯函数(另含一张单指针登记表,供写者与读者跨任务
|
||||
* 共享同一份快照——表本身不涉及 HAL/FreeRTOS,仍是纯逻辑)。
|
||||
* 零 HAL、零 FreeRTOS;唯一的全局状态是登记表,只由写者登记一次、之后只读。
|
||||
* MCU(ARMCC C99)与主机侧 MSVC 编译**同一份源码**。
|
||||
* 适用平台:任何 C99
|
||||
* 作者:王建锋
|
||||
@@ -215,3 +217,51 @@ void ioboard_di_snap_faults(const ioboard_di_snapshot_t *s, uint32_t *out_edges,
|
||||
*out_fails = s->fail_count;
|
||||
}
|
||||
}
|
||||
|
||||
/* ======================== 注册式共享读口 ======================== */
|
||||
|
||||
/*
|
||||
* 已登记的快照对象;NULL = 尚未登记。编译期零初始化,**没有初始化函数**——
|
||||
* 于是不存在"谁必须先跑"的启动顺序依赖(见头文件函数说明三)。
|
||||
* volatile 的理由见头文件函数说明四:跨任务传地址,读者侧不得被编译器缓存。
|
||||
* 占用后永不改变(register 只允许同一指针重复登记),所以读者读它不需要任何保护:
|
||||
* 要么读到 NULL(无写者),要么读到一个此后终身有效的地址。
|
||||
*/
|
||||
static const ioboard_di_snapshot_t *volatile s_di_snap_registered = 0;
|
||||
|
||||
/*
|
||||
* 函数功能:写者登记它的快照对象(只存指针,不复制、不改写内容)
|
||||
* 入口参数:s - 由本登记者独占写入的快照对象(s == 0 = 参数非法)
|
||||
* 返回值:0 = 登记成功 / 重复登记同一指针(幂等);-1 = 参数非法或已被另一指针占用
|
||||
* 限定条件:单写者;先登记再发布(语义全文见 ioboard_di.h 的同名声明)
|
||||
* 函数说明:占用后不可变——首个指针即唯一真相源,第二个不同指针一律拒绝并保留首个。
|
||||
*/
|
||||
int ioboard_di_snap_register(const ioboard_di_snapshot_t *s)
|
||||
{
|
||||
if (di_is_null(s) != 0U) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* 首个登记=占用。重复登记必须是**同一个**指针(幂等),否则拒绝并保留首个:
|
||||
* 两个快照对象并存就是两份真相,读者拿到哪一份取决于调度顺序,不可接受。 */
|
||||
if (s_di_snap_registered == 0) {
|
||||
s_di_snap_registered = s;
|
||||
return 0;
|
||||
}
|
||||
if (s_di_snap_registered == s) {
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* 函数功能:读者取已登记的快照对象
|
||||
* 入口参数:无
|
||||
* 返回值:已登记的快照指针;未登记 = NULL(消费者按"无数据源"处理,不是全 0)
|
||||
* 限定条件:任意上下文、无锁、不阻塞、不关中断
|
||||
* 函数说明:拿到指针后必须再走 ioboard_di_snap_read() 取一致值,不要直接读字段。
|
||||
*/
|
||||
const ioboard_di_snapshot_t *ioboard_di_snap_lookup(void)
|
||||
{
|
||||
return s_di_snap_registered;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user