feat(ioboard): wire 6 new CubeMX pins into 10-channel DO driver

Flat-expand the board output driver from 4 to 10 channels as decided:
IOBOARD_DO_COUNT 4->10, mask uint8_t->uint16_t, IOBOARD_DO_MASK_ALL
0x03FF.  The 6 new pins keep their bit positions: KO_LED1=PF2(bit4),
KO_LED2=PF3(bit5), KO_24V=PF4(bit6), KO4=PF5(bit7), KO5=PC15(bit8),
KO_LED3=PE6(bit9); the original 4 (KO6/TRIP/ERT/CLZ) keep bit0..3.
Backups-domain PC15 is used as a signal bit only (+/-3 mA limit).

No 24V supply interlock and no LED special-casing: the driver writes
KO_24V as an ordinary bit; callers needing relay power sequencing must
assert it before energizing a channel.  do_write/get/read_level and the
shadow register are all uint16_t; do_apply flushes four port segments
(GPIOC/GPIOF/GPIOC/GPIOE) and do_read_level caches three port ODRs.

UI: UI_DATA_DO_N 4->10, dio_do_mask uint16_t, UI_DATA_VER 3->4 because
dio_do_valid shifts 211->212; feed mask and dio row table extended;
content-page golden references regenerated for 51 rows / 7 pages.
Host ioboard tests 127/127 and ui_data tests 305/305 pass; Keil rebuild
0 errors 0 warnings.  RAM ledger, memory snapshot and size attestation
refilled from the authoritative map.  Docs: ioboard spec v1.2->v1.3 and
the resolved 6-pin question closed out.
This commit is contained in:
2026-11-18 14:25:32 +08:00
parent afd43f51e8
commit 74efa671bb
22 changed files with 438 additions and 294 deletions
+28 -13
View File
@@ -51,6 +51,11 @@ static int s_fail;
typedef char ioboard_di_ch_num_must_match_bsp[(IOBOARD_DI_CH_NUM == IOBOARD_DI_COUNT)
? 1 : -1];
/* 10 路开出 mask 必须是 uint16_t 宽:bit8 (KO5) / bit9 (KO_LED3) 放在 uint8_t 里会被静默截掉。
* 用编译期 sizeof 断言钉住 IOBOARD_DO_MASK_ALL 的类型,避免驱动把 mask 链路退回 uint8_t。 */
typedef char ioboard_do_mask_must_be_16bit[(sizeof(IOBOARD_DO_MASK_ALL) == sizeof(uint16_t))
? 1 : -1];
#define WIN IOBOARD_DI_DEBOUNCE_MS
/* ---------------------------------------------------------------------------
@@ -253,32 +258,42 @@ static void do_active_level_matches_documented_high(void)
}
/*
* 语义位:KO6=bit0、TRIP=bit1、ERT=bit2、CLZ=bit3,四位互异且恰好铺满 bit0..bit3。
* 为何值得测:这四个位就是出口通道号。互换两位 = 跳闸与告警出口对调,
* 语义位:前四路 KO6=bit0、TRIP=bit1、ERT=bit2、CLZ=bit3,新增六路从 bit4 到 bit9 依序排布;
* 十位互异且恰好铺满 bit0..bit9。为何值得测:这些位就是出口通道号,互换两位 = 两个出口对调,
* 台架上继电器照样"动",只有知道端子接线的人才会发现。
*/
static void do_semantic_bits_are_distinct_and_dense(void)
{
const uint8_t all = (uint8_t)(IOBOARD_DO_KO6 | IOBOARD_DO_TRIP
| IOBOARD_DO_ERT | IOBOARD_DO_CLZ);
const uint16_t all = (uint16_t)(IOBOARD_DO_KO6 | IOBOARD_DO_TRIP
| IOBOARD_DO_ERT | IOBOARD_DO_CLZ
| IOBOARD_DO_KO_LED1 | IOBOARD_DO_KO_LED2
| IOBOARD_DO_KO_24V | IOBOARD_DO_KO4
| IOBOARD_DO_KO5 | IOBOARD_DO_KO_LED3);
CHECK(IOBOARD_DO_KO6 == 0x01U, "KO6 is bit0 (PC14)");
CHECK(IOBOARD_DO_TRIP == 0x02U, "TRIP is bit1 (PF0)");
CHECK(IOBOARD_DO_ERT == 0x04U, "ERT is bit2 (PF1)");
CHECK(IOBOARD_DO_CLZ == 0x08U, "CLZ is bit3 (PF6)");
CHECK(all == IOBOARD_DO_MASK_ALL, "the four channel bits exactly fill IOBOARD_DO_MASK_ALL");
CHECK(IOBOARD_DO_MASK_ALL == 0x0FU, "IOBOARD_DO_MASK_ALL is 0x0F (bit4..7 have no hardware)");
CHECK(IOBOARD_DO_KO6 == 0x001U, "KO6 is bit0 (PC14)");
CHECK(IOBOARD_DO_TRIP == 0x002U, "TRIP is bit1 (PF0)");
CHECK(IOBOARD_DO_ERT == 0x004U, "ERT is bit2 (PF1)");
CHECK(IOBOARD_DO_CLZ == 0x008U, "CLZ is bit3 (PF6)");
CHECK(IOBOARD_DO_KO_LED1 == 0x010U, "KO_LED1 is bit4 (PF2)");
CHECK(IOBOARD_DO_KO_LED2 == 0x020U, "KO_LED2 is bit5 (PF3)");
CHECK(IOBOARD_DO_KO_24V == 0x040U, "KO_24V is bit6 (PF4)");
CHECK(IOBOARD_DO_KO4 == 0x080U, "KO4 is bit7 (PF5)");
CHECK(IOBOARD_DO_KO5 == 0x100U, "KO5 is bit8 (PC15 signal only)");
CHECK(IOBOARD_DO_KO_LED3 == 0x200U, "KO_LED3 is bit9 (PE6)");
CHECK(all == IOBOARD_DO_MASK_ALL, "all ten semantic bits exactly fill IOBOARD_DO_MASK_ALL");
CHECK(IOBOARD_DO_MASK_ALL == 0x03FFU, "IOBOARD_DO_MASK_ALL is 0x03FF (bit0..bit9 all have hardware)");
}
/*
* 路数常量:一片 74HC165 = 8 位。为何值得测:组装函数的移位用 IOBOARD_DI_COUNT 推导,
* 若有人为"将来两块级联 16 路"把它改成 16,返回值仍是 uint8_t,移位会溢出为未定义行为。
* 路数常量:一片 74HC165 = 8 位开入,开出扩到 10 路。为何值得测:组装函数的移位用
* IOBOARD_DI_COUNT 推导,若有人为"将来两块级联 16 路"把它改成 16,返回值仍是 uint8_t,
* 移位会溢出为未定义行为;开出 10 路则是为钉住新增六路后的总数,退回 4 路即红。
*/
static void counts_match_one_74hc165(void)
{
CHECK(IOBOARD_DI_COUNT == 8, "IOBOARD_DI_COUNT is 8 (one 74HC165)");
CHECK(IOBOARD_DI_MASK_ALL == 0xFFU, "IOBOARD_DI_MASK_ALL covers all 8 DI bits");
CHECK(IOBOARD_DO_COUNT == 4, "IOBOARD_DO_COUNT is 4 relay outputs");
CHECK(IOBOARD_DO_COUNT == 10, "IOBOARD_DO_COUNT is 10 relay outputs");
}
/* ---------------------------------------------------------------------------
+18 -10
View File
@@ -58,9 +58,10 @@
* 值区一字不动;解闭锁后重新提交可成功
* TC-UIDATA-020 apply 中途失败(预检与执行不一致的防御分支):如实 ERR_RANGE,
* 已生效的前几项不回滚(prot_set 无回滚接口,谎称整批未写更坏)
* TC-UIDATA-021 v2/v3 帧扩展:UI_DATA_VER == 3、既有字段偏移逐字节见证(只允许尾
* 追加)、cal_block 两种态(未标定/已标定)整帧往返、rt 帧 v3
* 尾追加的板级开入开出四字段落在 208..211(既有字段不挪位)
* TC-UIDATA-021 v2/v3/v4 帧扩展:UI_DATA_VER == 4、既有字段偏移逐字节见证(只允许尾
* 追加)、cal_block 两种态(未标定/已标定)整帧往返、rt 帧 v3/v4
* 尾追加的板级开入开出四字段落在 208..212(do_mask 210..211 两字节,
* do_valid 顺延到 212;其余既有字段不挪位)
* ── 以下 5 组 = 装置维护通道与时钟换算(道F task-3,
* docs/任务规划/UI补齐.md §2 第 3 行「装置维护 3 页」的地基)──
* TC-UIDATA-022 时钟换算与"无效值拒收":12 条锚点正向换算 + 反函数互逆 +
@@ -870,10 +871,12 @@ static void tc_param_frame_v2(void)
{
ui_data_par_t src;
ui_data_par_t got;
ui_data_rt_t layout_probe; /* 只为 sizeof 字段宽度,不求值、不发布 */
/* 版本号是页面与写侧唯一对齐凭据;v2 = par 尾追加 cal_block,
* v3 = rt 尾追加板级开入开出四字段(ui_data.h 文件头「追加即升此值」) */
CHECK(UI_DATA_VER == 3u, "TC-UIDATA-021a contract version is 3");
* v3 = rt 尾追加板级开入开出四字段,v4 = dio_do_mask 加宽为 uint16_t
* (do_valid 从 211 顺延到 212,旧布局读新帧会把 mask 高字节误当 valid) */
CHECK(UI_DATA_VER == 4u, "TC-UIDATA-021a contract version is 4");
/* v1 布局逐字节见证:字段只允许尾追加,任何插入/重排都会让下面四条红
* (页面按名字取字段,错位是静默的——只有把偏移钉死才照得出来) */
CHECK(offsetof(ui_data_par_t, seq) == 0u, "TC-UIDATA-021b seq offset unchanged");
@@ -888,8 +891,9 @@ static void tc_param_frame_v2(void)
/* rt 帧尺寸(MSVC x64 / ARMCC 实测均 216 B):v3 只是尾追加 4 个 uint8(恰好
* 落在旧尾部填充里,字段偏移 208..211 连续),但**整 struct 由 208 涨到 216**——
* 尾部 char[20] 之后有 4 B 对齐填充,加 4 B 正好把它顶满、再补 4 B 新填充
* (24 B 数组区 → 需要 8 的倍数)。所以 s_scr union 的真实增量是 8 B 而不是 4 B,
* 写侧 .bss 台账按 216 算(这条断言就是"别猜、量出来"的落点) */
* (24 B 数组区 → 需要 8 的倍数)。10 路开出把 dio_do_mask 加宽为 uint16_t,
* do_valid 顺延到 212,但尾填充吸收了这 1 B,实测 sizeof 仍为 216 B,
* 所以 s_scr union 上界不变(数值由 UI agent 用 cl.exe x64 探针实测给出)。 */
CHECK(sizeof(ui_data_rt_t) == 216u, "TC-UIDATA-021g rt frame is 216 B (v3 +8, union follows rt)");
CHECK(sizeof(ui_data_par_t) < sizeof(ui_data_rt_t),
"TC-UIDATA-021h par still smaller than rt (shared scratch follows rt)");
@@ -910,9 +914,13 @@ static void tc_param_frame_v2(void)
CHECK(offsetof(ui_data_rt_t, dio_di_valid) == 209u,
"TC-UIDATA-021p rt dio_di_valid offset 209");
CHECK(offsetof(ui_data_rt_t, dio_do_mask) == 210u,
"TC-UIDATA-021q rt dio_do_mask offset 210");
CHECK(offsetof(ui_data_rt_t, dio_do_valid) == 211u,
"TC-UIDATA-021r rt dio_do_valid offset 211");
"TC-UIDATA-021q rt dio_do_mask offset 210 (uint16_t spans 210..211)");
CHECK(offsetof(ui_data_rt_t, dio_do_valid) == 212u,
"TC-UIDATA-021r rt dio_do_valid offset 212 (+1 after do_mask widened to uint16_t)");
CHECK(sizeof(layout_probe.dio_do_mask) == sizeof(uint16_t),
"TC-UIDATA-021s rt dio_do_mask is uint16_t wide");
CHECK(UI_DATA_DO_N == 10u,
"TC-UIDATA-021t 10 DO channels in UI contract");
/* 闭锁态:1 = 未标定(写侧按 UA/UN/IA 三路 VALID 现算,本层只存真值) */
ui_data_init();