feat(ioboard): make KO_24V an auto relay supply enable (9 channels)
KO_24V (PF4, bit6) is not an externally controllable output: it feeds the other KO channels, so the driver now asserts it automatically whenever any relay-class channel (bit0/1/2/3/7/8) is attracted, and never for the three LED channels (bit4/5/9). Externally controllable outputs become 9; physical bit map, DO_COUNT=10, DO_MASK_ALL=0x03FF, k_do_pin[] binding, per-port BSRR segments and the uint16_t path are unchanged. - ioboard_do_write: clear the caller's bit6, synthesize it from IOBOARD_DO_RELAY_MASK (0x18F), then one shadow store + one apply, so bit6 changes in the same BSRR write as its GPIOF neighbours. - ioboard_do_get: bit6 now reports the actual 24V supply state, not an echo of the caller's write. Power-on release keeps PF4 low. - board test Phase 3 derives expectations from RELAY_MASK (no second truth table); the KO_24V row exercises "write ignored" and a new auto-24V check verifies set-on-relay / drop-on-release. - host contract test pins RELAY_MASK membership (excludes bit6 and LED bits, union fills 0x3FF); 131/131 passed. - docs: sync note v1.4 + BSP README unify the semantics (9 controllable + auto supply enable); stale "10 controllable" and "24V interlock not implemented" wording removed; netlist-unknown routing, PC15 backup-domain 3 mA limit and the missing auxiliary contact remain documented as open facts. Verified: Keil rebuild 0 error 0 warning (sizes identical to parent wave), host unit tests 131/131, check_bsp_err / check_doc_links / git diff --check clean. Board Phase 3 still needs a bench run.
This commit is contained in:
@@ -261,6 +261,11 @@ static void do_active_level_matches_documented_high(void)
|
||||
* 语义位:前四路 KO6=bit0、TRIP=bit1、ERT=bit2、CLZ=bit3,新增六路从 bit4 到 bit9 依序排布;
|
||||
* 十位互异且恰好铺满 bit0..bit9。为何值得测:这些位就是出口通道号,互换两位 = 两个出口对调,
|
||||
* 台架上继电器照样"动",只有知道端子接线的人才会发现。
|
||||
*
|
||||
* 位号与「可控性」是两件事:本用例只钉**位号**(bit6 = PF4 这个物理位在哪一位)。
|
||||
* 2026-11-18 起 bit6 已不是对外可控通道,而是**自动供电使能位(写入被忽略)**——
|
||||
* 位号没变,所以那条 CHECK 原样保留;触发集成员资格另由
|
||||
* do_relay_mask_covers_only_relay_channels() 单独钉。
|
||||
*/
|
||||
static void do_semantic_bits_are_distinct_and_dense(void)
|
||||
{
|
||||
@@ -276,7 +281,7 @@ static void do_semantic_bits_are_distinct_and_dense(void)
|
||||
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_KO_24V == 0x040U, "KO_24V is bit6 (PF4, auto 24V supply enable; writes ignored)");
|
||||
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)");
|
||||
@@ -285,7 +290,43 @@ static void do_semantic_bits_are_distinct_and_dense(void)
|
||||
}
|
||||
|
||||
/*
|
||||
* 路数常量:一片 74HC165 = 8 位开入,开出扩到 10 路。为何值得测:组装函数的移位用
|
||||
* 函数功能:钉住继电器类通道集合 IOBOARD_DO_RELAY_MASK 的成员资格(谁吸合会顺带拉起
|
||||
* PF4 的 24V 供电)——只有位号与并集关系,不触碰任何寄存器
|
||||
* 入口参数:无(纯宏契约)
|
||||
* 返回值:无(结果计入 s_pass / s_fail)
|
||||
* 限定条件:主机侧可编译;只依赖 ioboard.h 的宏,**不** include ioboard.c、不打 GPIO 桩,
|
||||
* 因此本用例不测 ioboard_do_write() 的实际行为,只测它赖以合成的那张表
|
||||
* 函数说明:为何值得测——这条集合是 2026-11-18 KO_24V 语义修订后**唯一**决定硬件供电的
|
||||
* 软件判据,写错了两种表现都不报错,且都要万用表才看得出来:
|
||||
* · 混进 LED 位(bit4 KO_LED1 / bit5 KO_LED2 / bit9 KO_LED3):操作员在屏上点一盏
|
||||
* 指示灯,硬件上就多了一路继电器线圈带电——台架表现为"LED 点亮顺带带电继电器线圈",
|
||||
* 现场则是一次谁都没有命令过的出口供电;
|
||||
* · 混进 bit6 自身:ioboard_do_write() 里 (relay & IOBOARD_DO_RELAY_MASK) 恒非零,
|
||||
* PF4 上电即自锁成常供电,连写 0 也"全释放"不掉。
|
||||
* 期望值 0x18F = bit0|bit1|bit2|bit3|bit7|bit8 的合值(KO6/TRIP/ERT/CLZ/KO4/KO5 六路),
|
||||
* 逐项对应 ioboard.h 里 IOBOARD_DO_RELAY_MASK 的宏体;LED 三路是 0x010/0x020/0x200、
|
||||
* bit6 是 0x040,均不在其中。换器件/换板若改了这张表,本用例先红,逼着改的人同步
|
||||
* README 与板级套件的期望值。
|
||||
*/
|
||||
static void do_relay_mask_covers_only_relay_channels(void)
|
||||
{
|
||||
const uint16_t led_bits = (uint16_t)(IOBOARD_DO_KO_LED1 | IOBOARD_DO_KO_LED2
|
||||
| IOBOARD_DO_KO_LED3);
|
||||
|
||||
CHECK(IOBOARD_DO_RELAY_MASK == 0x18FU,
|
||||
"IOBOARD_DO_RELAY_MASK == 0x18F (bit0 KO6 | bit1 TRIP | bit2 ERT | bit3 CLZ | bit7 KO4 | bit8 KO5)");
|
||||
CHECK((uint16_t)(IOBOARD_DO_RELAY_MASK & IOBOARD_DO_KO_24V) == 0U,
|
||||
"RELAY_MASK excludes bit6 itself (else PF4 self-latches and never releases)");
|
||||
CHECK((uint16_t)(IOBOARD_DO_RELAY_MASK & led_bits) == 0U,
|
||||
"RELAY_MASK excludes the three KO_LED channels (an LED must not energise relay coils)");
|
||||
CHECK((uint16_t)(IOBOARD_DO_RELAY_MASK | led_bits | IOBOARD_DO_KO_24V)
|
||||
== IOBOARD_DO_MASK_ALL,
|
||||
"RELAY_MASK + 3 LED bits + bit6 partition all 10 physical DO bits (nothing lost, nothing added)");
|
||||
}
|
||||
|
||||
/*
|
||||
* 路数常量:一片 74HC165 = 8 位开入;开出是 10 个**物理位**(对外可控 9 路,
|
||||
* bit6 是自动供电使能)。为何值得测:组装函数的移位用
|
||||
* IOBOARD_DI_COUNT 推导,若有人为"将来两块级联 16 路"把它改成 16,返回值仍是 uint8_t,
|
||||
* 移位会溢出为未定义行为;开出 10 路则是为钉住新增六路后的总数,退回 4 路即红。
|
||||
*/
|
||||
@@ -293,7 +334,8 @@ 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 == 10, "IOBOARD_DO_COUNT is 10 relay outputs");
|
||||
CHECK(IOBOARD_DO_COUNT == 10,
|
||||
"IOBOARD_DO_COUNT is 10 physical outputs (9 controllable + auto 24V enable)");
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------------
|
||||
@@ -875,6 +917,7 @@ int main(void)
|
||||
do_polarity_macros_are_complementary();
|
||||
do_active_level_matches_documented_high();
|
||||
do_semantic_bits_are_distinct_and_dense();
|
||||
do_relay_mask_covers_only_relay_channels();
|
||||
counts_match_one_74hc165();
|
||||
|
||||
/* 三、开入极性(与第二节对称) */
|
||||
|
||||
Reference in New Issue
Block a user