From 2b466b85f0b07ad05fdf974af6cfbdd30582abc9 Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Mon, 16 Nov 2026 21:45:08 +0800 Subject: [PATCH] feat(ui): add DI/DO status page showing 8 inputs and 4 outputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- App/app/ui_data_feed.c | 120 ++++++- App/task/default_task.c | 32 +- App/util/ioboard_di.c | 52 ++- App/util/ioboard_di.h | 56 ++++ Drivers/BSP/IOBOARD/README.md | 6 + Drivers/BSP/UI/ui_data.h | 50 ++- Drivers/BSP/UI/ui_font_cn_12.c | 427 +++++++++++++------------ Drivers/BSP/UI/ui_menu_tab.c | 75 ++--- Drivers/BSP/UI/ui_menu_tab.h | 2 +- Drivers/BSP/UI/ui_page_di_do.c | 231 +++++++++++++ Drivers/BSP/UI/ui_page_di_do.h | 26 ++ Drivers/BSP/UI/ui_page_registry.c | 56 ++-- Drivers/BSP/UI/ui_page_registry.h | 2 +- MDK-ARM/STM32F407-Demo.uvprojx | 5 + docs/UI设计/UI_数据供给设计说明.md | 23 +- simulator/CMakeLists.txt | 1 + simulator/tests/check_content_pages.py | 6 + simulator/tests/check_menu_rows.py | 19 +- simulator/tests/ref/shot_di_do.bin | Bin 0 -> 3200 bytes simulator/tests/ref/shot_di_do_p2.bin | Bin 0 -> 3200 bytes test/host/ioboard/ioboard_test.c | 73 +++++ test/host/ui_data/ui_data_test.c | 47 ++- ui_cn_chars.txt | 2 +- ui_menu_tree.txt | 1 + 24 files changed, 1012 insertions(+), 300 deletions(-) create mode 100644 Drivers/BSP/UI/ui_page_di_do.c create mode 100644 Drivers/BSP/UI/ui_page_di_do.h create mode 100644 simulator/tests/ref/shot_di_do.bin create mode 100644 simulator/tests/ref/shot_di_do_p2.bin diff --git a/App/app/ui_data_feed.c b/App/app/ui_data_feed.c index 94e273e4..89ba7a06 100644 --- a/App/app/ui_data_feed.c +++ b/App/app/ui_data_feed.c @@ -5,6 +5,15 @@ * (实时量 rt / 参数 par / 装置信息 info),经 Drivers/BSP/UI/ui_data.h * 的发布 API 推给 UI 层;本模块是快照的**唯一填充者**,不含任何布局、 * 格式化与 LVGL 调用(显示规格全在页面行表,同文档 §8) + * 唯一填充者的边界(「开入开出」页补记):rt 帧里**每一个**业务字段的一手 + * 取数都发生在这里——包括板级 8 路开入(经 App/util/ioboard_di.h 的注册式 + * 读口读 defaultTask 发布的去抖快照)与 4 路开出(读 Drivers/BSP/IOBOARD 的 + * 影子寄存器)。页面只消费快照,不得自己去调 ioboard_* / ioboard_di_*: + * 那是绕过节拍与失败语义的第二条取数路径,读失败就会直变成屏上的 + * "开入全部复归"。两族数据刻意不进 yx_bits/yx_valid(板级引脚 ≠ 104 点表)。 + * 写入者互斥(同一条边界的另一面):本模块的四个开入开出字段只由本文件写, + * 而开入的**上游**只由 defaultTask 写(ioboard_di 快照的单写者约束), + * 本模块不发布、不修复、不纠正 defaultTask 的结果——读不到就如实报无效。 * 写方向(道F task-1):同一条 tick 顺带把页面投递的定值整定请求落定—— * ui_data_param_drain() 每轮取一条,执行动作经本文件的 s_param_ops * (locked = prot_set_locked / check = g_prot_set_meta 上下限 / @@ -32,6 +41,12 @@ * 装配层实现 + 首轮懒绑(时序与通道四绑定等价, * 见 feed_yt_bind_once 函数头);行数等值由编译期 * 守卫钉,量纲分档与合法域分档同源同序 + * v3 2026-11-16 DTU 项目组 「开入开出」页:rt 帧尾四字段填充—— + * dio_do_mask/dio_do_valid 取 ioboard_do_get() 的影子 + * 寄存器;dio_di_mask/dio_di_valid 经 ioboard_di 的 + * 注册式读口取 defaultTask 的去抖快照,**读失败保留 + * 上一次已发布的值并令有效位 = 0**(铁律:读数失败不得 + * 当"开入全部复归"上报) * v1.2 2026-10-26 DTU 项目组 道F task-16:删除本地镜像 feed_cal_block(), * 两个调用点(填帧 / 门控比较)改调 * adc_cal_prot_blocked()——同一份三路判定此前在 @@ -62,6 +77,7 @@ #include "ui_data.h" #include "ui_net_sink.h" /* UI_NET_SINK_PORT:远程显示(RemoDispBus)监听端口 */ #include "ftp_cfg.h" /* FTP_CFG_USER_MAX / ftp_cfg_get() */ +#include "ioboard.h" /* 板级 4 路开出:ioboard_do_get / IOBOARD_DO_* 语义位(下层 → 上层合法方向) */ /* 同层(App)数据源 */ #include "adc_input.h" /* ADC_SEM_COUNT / adc_input_raw(TEMP 码值) */ @@ -74,6 +90,7 @@ #include "sys_clock.h" /* 墙钟字符串 */ #include "iec104_comm.h" /* 道G task-9:[comm] 真源 getter/setter/脏位;快照端口切 getter,IEC104_SERV_PORT 字面宏同笔删除 */ #include "iec104_pts.h" /* task-15 批4:遥信点数与单/双点性质(点表事实的唯一来源) */ +#include "ioboard_di.h" /* 板级 8 路开入:注册式读口(lookup 拿写者快照 → snap_read 取一致值) */ /* 私有宏定义区 */ @@ -125,13 +142,41 @@ typedef char feed_chk_set_n_t[(UI_DATA_SET_N == (uint32_t)PS_ID_COUNT) ? 1 : -1] * 故在写侧也钉一道(BSP 侧同一条守卫在 Drivers/BSP/UI/ui_data.c) */ typedef char feed_chk_set_u8_t[((uint32_t)PS_ID_COUNT <= 64u) ? 1 : -1]; typedef char feed_chk_fuser_t[(UI_DATA_FUSER_LEN >= FTP_CFG_USER_MAX) ? 1 : -1]; +/* v3:板级开入/开出位宽对表。UI_DATA_DI_N / UI_DATA_DO_N 是 BSP 契约里给页面用的 + * 路数(BSP 看不见 App 头,物理上自证不了),真值分别是 App/util/ioboard_di.h 的 + * IOBOARD_DI_CH_NUM(刻意不 include ioboard.h 的那个数)与 ioboard.h 的四位语义宏。 + * 本文件是**唯一**同时看见两侧的编译单元——这里不等号一翻,编不过 */ +typedef char feed_chk_di_n_t[(UI_DATA_DI_N == IOBOARD_DI_CH_NUM) ? 1 : -1]; +/* 开出位宽:拿四位语义宏本身还原成位数——ioboard.h 少给一位或多给一位都在这里翻脸 */ +#define FEED_DO_N_REF ((IOBOARD_DO_KO6 | IOBOARD_DO_TRIP | IOBOARD_DO_ERT | IOBOARD_DO_CLZ) + 1u) +typedef char feed_chk_do_n_t[((UI_DATA_DO_N * 2u) == FEED_DO_N_REF) + || ((UI_DATA_DO_N * 4u) == FEED_DO_N_REF) + || ((UI_DATA_DO_N * 8u) == FEED_DO_N_REF) ? 1 : -1]; + +/* 板级开出语义位集合:bit0..bit3 = KO6/TRIP/ERT/CLZ(ioboard.h 的四位宏,1 = 吸合)。 + * 为什么在这一处汇成一个掩码:填帧要用它,位宽守卫也要用它;两处各写一遍等于 + * 第二个真相(少写一位,屏上就凭空多出一路"永远释放"的开出) */ +#define FEED_DO_MASK ((uint8_t)(IOBOARD_DO_KO6 | IOBOARD_DO_TRIP | \ + IOBOARD_DO_ERT | IOBOARD_DO_CLZ)) /* 静态变量定义区 */ +/* 上一次**已发布**的板级开入 mask。 + * 为什么单独存一份而不是让页面自己记:ioboard_di_snap_read() 返回 0 时(快照尚未 + * 有效 / 读期被持续抢占),本次没有新数据可发;此时屏上唯一诚实的内容是"上次已知 + * 状态 + 无效标记"。若就地填 0,现场会把"全部复归"当成事实——那是比不刷新更危险的 + * 假信息(开入全局复归往往被当成"所有开关都断开了"来处置)。所以失败拍沿用本变量, + * 且**只在本变量有意义时**(s_dio_di_seen)才沿用:从未读到过有效快照时它是 0, + * 但此时 dio_di_valid 也是 0,页面按无效画,不会把 0 当读数。 + * 与 s_scr 的关系:s_scr 每帧清零,装不下跨拍状态,故分开存(1 B .bss)。 */ +static uint8_t s_dio_di_last; +static uint8_t s_dio_di_seen; /* 1 = s_dio_di_last 曾来自一次成功的快照读 */ + /* 组装缓冲:三帧串行填充,共用一块存储,省两份 RAM。 - * 实际最大者是**实时帧**(208 B > par 192 B > info),故给 par 尾追加字段 + * 实际最大者是**实时帧**(212 B > par 192 B > info),故给 par 尾追加字段 * 只要不超过 rt 就一字节 RAM 都不多花(这条由主机单测 TC-UIDATA-021g/h 钉住, - * 尺寸一变这里就是唯一会撒谎的地方) */ + * 尺寸一变这里就是唯一会撒谎的地方;rt 帧本身就是 rt/par/info 三帧里最大的, + * 它每长 1 B,这块 union 就跟着长 1 B——RAM 台账要按 rt 的量算) */ static union { ui_data_rt_t rt; ui_data_par_t par; @@ -311,6 +356,73 @@ static uint64_t feed_yx_bits(void) { return bits; } +/* + * 函数功能:填板级 8 路开入(读 defaultTask 发布的去抖快照) + * 入口参数:p_snap - 目标帧(调用方已清零) ui_data_rt_t * + * 返回值:无 + * 限定条件:uiTask 上下文;无锁、不阻塞、不关中断(ioboard_di 的读者路径契约) + * 函数说明(本函数是「读失败不得当全 0 上报」这条铁律在 UI 侧的落点): + * ① 未登记(lookup 返回 NULL,如 TEST_SUITE_STORAGE 构建里没有开入发布者): + * 没有数据源 —— 有效位 = 0,mask 保持"最近已知值或不曾有过"。 + * ② 登记了但 snap_read 返回 0(快照尚未有效 / 读期被持续抢占):**本次没有新 + * 数据**,不是"读数 = 0"。有效位 = 0,mask 沿用 s_dio_di_last(上次成功读 + * 到的去抖结果)——绝不在这里填 0;只有从未成功读过时才轮到 0,而那种情况 + * 有效位同样为 0,页面按"无数据"画。 + * ③ 成功(返回 1):mask 记入 s_dio_di_last 并带回滚能力(s_dio_di_seen), + * 有效位 = 1。 + * 为什么不直接读 s->mask:那会绕过写者的"奇-写-偶"序号协议,可能拿到写者写到 + * 一半的字段(ioboard_di.h 的"不要直接读 s->mask")。 + * 代价:每次只读一拍,不做平均/滤波——去抖已经在写者侧(20 ms)完成,这里再加 + * 一层延迟只会让屏上比现场更慢。 + */ +static void feed_fill_dio_di(ui_data_rt_t *p_snap) { + const ioboard_di_snapshot_t *s = ioboard_di_snap_lookup(); + uint8_t mask = 0u; + + p_snap->dio_di_valid = 0u; /* 先按"无新数据"记账,成功路径再翻 1 */ + if (s == NULL) { + /* 没有数据源:沿用上次已知值(从未有过则 0,但 valid=0 已声明它不可消费) */ + p_snap->dio_di_mask = (s_dio_di_seen != 0u) ? s_dio_di_last : 0u; + return; + } + if (ioboard_di_snap_read(s, &mask, NULL) == 0u) { + /* 读失败 / 本次无新数据:**不把 mask 写进 s_dio_di_last**,也不填 0—— + * snap_read 返回 0 时 out_mask 只是"最近一次发布值",不是一次成功读数 */ + p_snap->dio_di_mask = (s_dio_di_seen != 0u) ? s_dio_di_last : 0u; + return; + } + s_dio_di_last = mask; + s_dio_di_seen = 1u; + p_snap->dio_di_mask = mask; + p_snap->dio_di_valid = 1u; +} + +/* + * 函数功能:填板级 4 路开出(读驱动的软件影子寄存器) + * 入口参数:p_snap - 目标帧(调用方已清零) ui_data_rt_t * + * 返回值:无 + * 限定条件:uiTask 上下文;ioboard_do_get 只读一个 volatile 影子寄存器, + * 无硬件访问、无临界区,任意上下文可调 + * 函数说明:mask 只保留 bit0..bit3(IOBOARD_DO_KO6/TRIP/ERT/CLZ),高位是驱动 + * 的"无对应硬件"区,原样透传进屏幕等于凭空多出 4 路。 + * ⚠ 这是**软件意图**(上次成功写入的值),不是继电器机械吸合实测; + * 驱动无辅助触点回读通路(ioboard.h 的 ioboard_do_get 注),页面措辞 + * 不得让操作员以为读到了机械反馈。 + * 失败只可能是 out_mask 为 NULL(本处传栈上地址,不会发生);仍按 + * "取不到就报无效"处理,不为不可能的分支编造一个成功态。 + */ +static void feed_fill_dio_do(ui_data_rt_t *p_snap) { + uint8_t shadow = 0u; + + if (ioboard_do_get(&shadow) == BSP_OK) { + p_snap->dio_do_mask = (uint8_t)(shadow & FEED_DO_MASK); + p_snap->dio_do_valid = 1u; + } else { + p_snap->dio_do_mask = 0u; + p_snap->dio_do_valid = 0u; + } +} + /* * 函数功能:组装实时量快照(遥测 9 路 + 相量实例槽 + 遥信 + 频率 + 墙钟) * 入口参数:p_snap - 目标帧(调用方已清零) ui_data_rt_t * @@ -398,6 +510,10 @@ static void feed_fill_rt(ui_data_rt_t *p_snap, uint32_t tick_ms) { p_snap->yx_bits = feed_yx_bits(); p_snap->yx_valid = FEED_YX_VALID_MASK; p_snap->yx_dp = feed_yx_dp(); + /* 板级开入开出(v3 尾追加):与上面三张点表位图**互不引用**——板级引脚不是 + * 104 点表事实,塞进 yx_* 就等于拿物理引脚冒充点表(见 ui_data.h 字段注) */ + feed_fill_dio_di(p_snap); + feed_fill_dio_do(p_snap); /* 点数漂移检查(只在真漂走时打一条日志):点表 YX_N 与本层 UI_DATA_YX_N 一旦不等, * 页面按 33 行画、协议按另一个数上送,两边都"看起来正常"——这是静默错,值得花一条 * DBG(约 90 B Flash)换一次现场可见的自证;只打一次不刷屏(同丢弃计数口径) */ diff --git a/App/task/default_task.c b/App/task/default_task.c index d0b97b86..6ef1caba 100644 --- a/App/task/default_task.c +++ b/App/task/default_task.c @@ -153,6 +153,31 @@ static ioboard_di_ch_t s_di_ch[IOBOARD_DI_CH_NUM]; static ioboard_di_snapshot_t s_di_snap; static uint8_t s_di_pub_mask; static uint32_t s_di_fail_edges_seen; + +/* + * 函数功能:把 s_di_snap 登记到开入快照的共享读口(写者侧一次登记) + * 入口参数:无 + * 返回值:无(失败只留一条自检记录) + * 限定条件:defaultTask 初始化段调用一次;仅存在于 !TEST_SUITE_STORAGE 构建 + * 函数说明: + * 读者经 ioboard_di_snap_lookup() 取指针后走 ioboard_di_snap_read()。 + * 为什么在声明处而不是 poll 体内:ioboard_di_snap_register 是幂等的(同一指针重复 + * 登记返回 0),放在这里每轮任务启动只跑一次,且**先于**第一次 default_task_di_poll + * 发布,读者不会看到"未登记"之外的任何中间态。注册表本身零初始化,不依赖启动顺序 + * (可在 app_main_init 阶段就被调用),这里不新增任何内核前调用的风险面。 + * 必须在 !TEST_SUITE_STORAGE 区内:STORAGE 套件构建把 s_di_snap 整段挖掉, + * 登记语句留在外面就是编译错误。 + */ +static void default_task_di_publish_register(void) { + if (ioboard_di_snap_register(&s_di_snap) != 0) { + /* 只可能是"已被另一个指针占用"——本仓只有本处登记 s_di_snap,走到这里说明 + * 有人加了第二个写者:不静默接受,留一条痕迹。此刻控制台写者尚未注册, + * syslog_post 按内核状态分流到 s_preboot 静态数组(App/log/sys_log_mcu.c)。 + * 栈代价:该调用点内联约 216 B 日志行缓冲,只在这条不可达分支上——不计入 + * defaultTask 的静态最坏链(正常路径不经过),但改本函数结构时别把它搬进热路径。 */ + syslog_post(SYSLOG_SELFTEST, "di snapshot register rejected"); + } +} #endif /* @@ -223,7 +248,12 @@ void default_task_func(void *argument) { /* 开入第一次读取放在 bring-up 之后:此刻 MX_GPIO_Init 早已配好引脚(模块初始化期), * 且看门狗尚未启动,几十微秒的移位读不会影响任何节拍。 - * 发布开关 DEFAULT_TASK_DI_PUBLISH_EN 在文件作用域统一定义,此处**不得重复定义**。 */ + * 发布开关 DEFAULT_TASK_DI_PUBLISH_EN 在文件作用域统一定义,此处**不得重复定义**。 + * 发布前先把快照登记到共享读口(读者 = ui_data_feed,见 ioboard_di.h): + * 登记本身零硬件访问,但 s_di_snap 声明在 !TEST_SUITE_STORAGE 区内,登记也须同区。 */ + #if !defined(TEST_SUITE_STORAGE) + default_task_di_publish_register(); + #endif (void)default_task_di_poll(); /* 注册控制台写者:本任务此后是串口唯一发送者(其余任务只写环形缓冲)。 diff --git a/App/util/ioboard_di.c b/App/util/ioboard_di.c index 6fdefe9c..93def5ab 100644 --- a/App/util/ioboard_di.c +++ b/App/util/ioboard_di.c @@ -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; +} diff --git a/App/util/ioboard_di.h b/App/util/ioboard_di.h index 7cc86587..3c07c638 100644 --- a/App/util/ioboard_di.h +++ b/App/util/ioboard_di.h @@ -6,6 +6,9 @@ * 读引脚在 App/util/ioboard_di.c 的 .c 部分(本 .c 就是那一半,属于同一模块的 * 可测部分);本头文件**不 include** HAL / FreeRTOS / ioboard.h / main.h, * 可被主机侧 MSVC 单测直接编译。 + * 跨任务共享:快照对象归写者(defaultTask)私有,读者经下方的 + * ioboard_di_snap_register / ioboard_di_snap_lookup 拿指针,仍用同一套 + * 序号协议(ioboard_di_snap_read)读——不引入第二份副本、不引入锁。 * * 为什么去抖不放进 ioboard.c:BSP 只回答"让硬件动起来并如实汇报",去抖与 * 失败语义是上报层的事;而且 ioboard.c 依赖 HAL/FreeRTOS,主机侧编不过。 @@ -160,6 +163,59 @@ void ioboard_di_snap_reset(ioboard_di_snapshot_t *s); /* 诊断副本:不保证一致性,仅供自检/串口打印 */ void ioboard_di_snap_copy(const ioboard_di_snapshot_t *s, ioboard_di_snapshot_t *out); +/* ======================== 注册式共享读口 ======================== */ + +/* + * 为什么要有这一对函数:快照对象是写者(defaultTask)的文件作用域静态变量, + * 作用域外拿不到地址。让读者自己 include 写者的私有状态 = 打开第二个写者入口; + * 让读者 copy 一份 = 造出第二份随时间漂移的真相。所以中间只放"登记一个地址", + * 读者拿走指针后**仍走 ioboard_di_snap_read() 的同一套序号协议**(不是第二个读者实现)。 + * 在此之前 ioboard_di_snap_read() 在本仓没有任何调用方(它只被主机侧单测覆盖), + * 本对函数就是它"跨任务可用"的接线:读者 = App/app/ui_data_feed.c(uiTask 上下文), + * 写者 = defaultTask(登记点 = default_task_di_publish_register)。 + * 为什么注册表放在本纯逻辑层:它就是一个指针 + 单写者判据,零 HAL / 零 FreeRTOS; + * 放进来才能在主机侧单测里直接验证"拒绝第二个写者",而不必上板。 + */ + +/* + * 函数功能:写者登记它的快照对象(产品里 = defaultTask 的 s_di_snap) + * 入口参数:s - 由本登记者独占写入的快照对象(s == 0 = 参数非法) + * 返回值:0 - 成功(首次登记成功,或重复登记的**正是同一个**指针:幂等) + * -1 - 参数非法(s == 0),或已被**另一个**指针占用(保留首个,拒绝后来的) + * 限定条件:写在登记成功之后**才开始**发布,不得先发布再登记(见函数说明第二段) + * 函数说明: + * 一、只存指针:不复制、不初始化、不改写快照内容——快照的初始态由写者自己 + * (ioboard_di_snap_reset 或静态零初始化)负责,本函数不代劳。否则登记时刻 + * 就是一个"把写者正在发布的快照清零"的竞态点。 + * 二、单写者:占用后第一个指针就是唯一真相源。第二个不同指针 = 返回 -1 并保留首个; + * 重复登记同一指针 = 幂等返回 0。为什么换写者也不行:指针一变,读者拿到的 + * 旧指针生命周期无法保证,且两个快照对象同时存在正是本函数要禁掉的局面 + * (换写者需要先下线旧写者,本平台没有这种用法,故不提供注销)。 + * 三、登记表本身是编译期零初始化的文件作用域静态,**没有"初始化"步骤**: + * 于是不存在"谁必须先跑一遍初始化"的启动顺序依赖,本函数也是幂等的。 + * 是否可用在任务启动之前:可以(注册表零初始化、本就用于 app_main_init 阶段的 + * 提前登记),但届时还没有读者——本仓的登记点在写者自己的任务启动段: + * default_task_func 里调 default_task_di_publish_register(),先于首次 + * default_task_di_poll() 发布。 + * 四、注册表置 volatile:读者(uiTask / 任意上下文)与写者(defaultTask)跨任务 + * 通过它传地址,编译器不得把"看起来没变"的读缓存起来。指针本身的赋值在 M4 上 + * 是单条 32 位存储,读者不会看到半个地址;"读到非 0 之后指针不再变化"由上面 + * 的不可变约束保证,所以读者侧既不用关中断也不用再校验一次。 + */ +int ioboard_di_snap_register(const ioboard_di_snapshot_t *s); + +/* + * 函数功能:读者取已登记的快照对象 + * 入口参数:无 + * 返回值:已登记的快照指针;未登记(或登记被拒绝且从未成功过)= NULL + * 限定条件:任意上下文(任务 / 中断 / 启动段)、无锁、不阻塞、不关中断 + * 函数说明:拿到指针后必须自己调 ioboard_di_snap_read() 取一致值,**不要**直接读 + * s->mask —— 直接读会不带序号校验,拿到写者写到一半的字段。 + * 返回 NULL 表示"本构建没有开入发布者"(如 TEST_SUITE_STORAGE), + * 消费者应把它当作"无数据源",不是"开入全 0"。 + */ +const ioboard_di_snapshot_t *ioboard_di_snap_lookup(void); + /* * 函数功能:读"有效 → 失效 下降沿"累计次数与"连续失败拍数" * 入口参数:s - 快照对象 diff --git a/Drivers/BSP/IOBOARD/README.md b/Drivers/BSP/IOBOARD/README.md index bce69294..fbfb65ab 100644 --- a/Drivers/BSP/IOBOARD/README.md +++ b/Drivers/BSP/IOBOARD/README.md @@ -243,6 +243,12 @@ ioboard_bits.c ← 纯逻辑:位序组装。只依赖 ,主机侧 不是「继电器现在真的动没动」。后者只能靠辅助触点或万用表。 5. **PE2 / PE4 是命名残留**:硬件无信号,本驱动不配置、不读取。若 CubeMX 里还留着它们, 那是 `IN_D4` / `IN_E4` 的旧配置,不影响本驱动。 +6. **开入位序未经人工验证**:8 路开入与板级丝印 `DI_A`~`DI_H` 的对应关系目前只是 + **按移位顺序推定**,没有现场逐路短接核对过。2026-11-16 那一轮读过 8 次、`ok_reads` 全部正常、 + 但 `read` 恒为 `0x00`——原因是操作员来不及逐路短接,不是驱动故障:数据线通路本身是好的。 + 判定标准见 §5 第 1 步(短接某一路应读到对应位的 `0x01`/`0x80`)。 + **在完成这一步之前,任何"第 n 路开入处于什么状态"的结论都只能算推定。** + UI 侧的状态页 `ui_page_di_do.c` 在文件头注释里做了同样的声明。 --- diff --git a/Drivers/BSP/UI/ui_data.h b/Drivers/BSP/UI/ui_data.h index 4a836ab3..d7a1e940 100644 --- a/Drivers/BSP/UI/ui_data.h +++ b/Drivers/BSP/UI/ui_data.h @@ -22,6 +22,11 @@ * 作者:王建锋 * 创建日期:2026-10-25 * 修改记录: + * v3 2026-11-16 DTU 项目组 「开入开出」页数据源:实时帧尾追加 + * dio_di_mask/dio_di_valid/dio_do_mask/dio_do_valid + * 四字段(板级 8 路开入 + 4 路开出),与 33 点遥信 + * 位图 yx_bits/yx_valid/yx_dp **刻意互不引用**——前者 + * 是板级引脚事实,后者是 104 点表语义,见字段注 * v1.x 2026-10-27 DTU 项目组 道G task-9:通道六通讯参数注入表 * (ui_data_comm_ops_t,通讯设置页消费)。 * v1.0 2026-10-25 王建锋 创建(道E task-14:契约 §4 快照层落地;相对契约 @@ -55,14 +60,26 @@ extern "C" { #include +/* 板级开入路数(v3):实时帧 dio_di_mask / dio_di_valid 的位宽依据。 + * 为什么在契约里再写一个数而不 include App/util/ioboard_di.h:本头是表现层叶子, + * 不得 include 任何 App 头(分层门禁拦提交)。两处数字的等值由**写侧**(App 侧唯一 + * 同时看见两份头的编译单元 App/app/ui_data_feed.c)编译期守卫钉死,BSP 物理上 + * 自证不了,所以守卫点放在写侧而不是这里 */ +#define UI_DATA_DI_N 8u +/* 板级开出路数(v3):dio_do_mask / dio_do_valid 的位宽依据。等值守卫同上落在写侧 + * (与 Drivers/BSP/IOBOARD/ioboard.h 的 IOBOARD_DO_KO6/TRIP/ERT/CLZ 四位对表) */ +#define UI_DATA_DO_N 4u + /* * 契约版本:结构体字段只允许尾部追加,追加即升此值并在写侧填默认值 * (禁止删除或重排字段——页面按名字取,重排是静默错位; * 口径 docs/UI设计/UI_数据供给设计说明.md §4.3) */ /* v2(2026-10-26,道F task-1):ui_data_par_t 尾追加 cal_block——版本号是页面与 - * 写侧唯一的对齐凭据,追加字段不升版 = 老页面按新帧长 memcpy 时静默错位 */ -#define UI_DATA_VER 2u + * 写侧唯一的对齐凭据,追加字段不升版 = 老页面按新帧长 memcpy 时静默错位 + * v3(2026-11-16):「开入开出」页——ui_data_rt_t 尾追加 dio_di_mask/dio_di_valid/ + * dio_do_mask/dio_do_valid(板级开入开出,208 B → 212 B,见 ui_data_rt_t 字段注) */ +#define UI_DATA_VER 3u /* ── 通道数量 ─────────────────────────────────────────────────────────────── */ @@ -159,6 +176,35 @@ typedef struct { uint8_t clock_ok; /* 0 = 墙钟无效(RTC 异常/未对时) */ uint8_t rsv3[3]; /* 预留(对齐填充) */ char clock[UI_DATA_CLOCK_LEN]; /* "YYYY-MM-DD HH:MM:SS";无效时空串 */ + /* ── v3 尾追加:板级开入 / 开出(「开入开出」页的数据源)────────────────── + * 为什么另开四个字段而不复用上面的 yx_bits/yx_valid:那三张位图是**104 点表 + * 语义**(bit i = 点表第 i 点),板级 ioboard 的 8 路开入与点表没有任何映射关系 + * (点表 YX1~4 开关位置点在 V0.1 恒无效)。把板级开入塞进点表位图 = 拿物理引脚 + * 冒充点表事实,主站与屏会按两套语义读同一组位——那正是本仓最忌的静默错。 + * 两族字段互不引用,页面各画各的,谁改了谁也不会悄悄改到另一边。 + * 字段宽度:8 路 / 4 路各一字节即够,两块 mask/valid 合占 4 B,struct 由 208 B + * 变 212 B(对齐只到 4,无尾部填充);写侧共用缓冲 s_scr 因此 +4 B(宿主机单测 + * TC-UIDATA-021g 钉尺寸,改字段要同步那里) */ + uint8_t dio_di_mask; /* 8 路开入去抖后状态:bit n = 通道 n 合(1)。 + * 来源 = defaultTask 的 DI 去抖快照 + * (App/util/ioboard_di.h),写侧按序号协议 + * 取一致值,不直接读引脚 */ + uint8_t dio_di_valid; /* 1 = 本次读到一致且有效的开入快照;0 = 无数据源 + * (未登记)或写入过程中读失败。**0 时 + * dio_di_mask 仍是上一次的有效值,但不得当 + * 新数据用**——铁律"读失败不得当全 0 上报" + * 的落点:全 0 在现场会被读成"开入全部复归"。 + * 与本文件头的 valid(首帧)不是同一件事 */ + uint8_t dio_do_mask; /* 4 路开出影子寄存器:bit n = 吸合(1)。 + * 语义位 = IOBOARD_DO_KO6/TRIP/ERT/CLZ + * (bit0..bit3)。⚠ 这是**软件意图**(上一次 + * 成功写入的值),不是继电器机械吸合实测—— + * 本平台没有辅助触点回读通路,页面措辞 + * 不得让人以为读到了机械反馈 */ + uint8_t dio_do_valid; /* 1 = 本帧已从驱动取到影子寄存器;0 = 未取到 + * (此时 dio_do_mask 不可消费)。取影子寄存器 + * 零硬件访问,正常恒 1;保留 0 态是为了让 + * "读失败"与"全部释放"在屏上仍能区分 */ } ui_data_rt_t; /* ── 通道二:参数(写侧节拍 = 定值校验和变化才发)────────────────────────── */ diff --git a/Drivers/BSP/UI/ui_font_cn_12.c b/Drivers/BSP/UI/ui_font_cn_12.c index 19887f95..7ae27905 100644 --- a/Drivers/BSP/UI/ui_font_cn_12.c +++ b/Drivers/BSP/UI/ui_font_cn_12.c @@ -510,6 +510,10 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0xc8, 0x1, 0xff, 0x30, 0x2a, 0x5, 0x7f, 0xc8, 0x10, + /* U+5438 "吸" */ + 0xef, 0xd4, 0x8a, 0x91, 0x52, 0x4a, 0x4f, 0x48, + 0x69, 0x8f, 0x2a, 0xa8, 0x81, 0x28, 0x48, 0x80, + /* U+544A "告" */ 0x4, 0x4, 0x80, 0xff, 0x22, 0x0, 0x41, 0xff, 0xc0, 0x3, 0xfe, 0x40, 0x48, 0x9, 0xff, 0x20, @@ -1286,6 +1290,11 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x3f, 0xf8, 0x70, 0x15, 0x4, 0x93, 0x11, 0x82, 0x0, + /* U+91CA "释" */ + 0x17, 0xfc, 0x44, 0x85, 0x54, 0x47, 0x14, 0x4d, + 0x7c, 0x21, 0x1f, 0x70, 0x95, 0xfc, 0x82, 0x10, + 0x40, + /* U+91CD "重" */ 0x3, 0xcf, 0x80, 0x10, 0x7f, 0xf4, 0x44, 0xff, 0x91, 0x13, 0xfe, 0x4, 0xf, 0xf8, 0x10, 0x7f, @@ -1548,190 +1557,192 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { {.bitmap_index = 1123, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 1140, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 1157, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1174, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1191, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1208, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1225, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 1239, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1256, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1273, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1290, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1307, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1324, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1341, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1358, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1375, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1392, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1409, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1425, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1442, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1459, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1476, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1493, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1510, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 1524, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1541, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1558, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1575, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1592, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1609, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1626, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1642, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1659, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1676, .adv_w = 192, .box_w = 9, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 1690, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1707, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1724, .adv_w = 192, .box_w = 9, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 1738, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1755, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1772, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1789, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1806, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1823, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1840, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1857, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1874, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1891, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1908, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1925, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1942, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1959, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1976, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 1993, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2010, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2027, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2044, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2061, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2078, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2095, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2112, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2129, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2145, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 2158, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2175, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2191, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2208, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2222, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2238, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2255, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2272, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2289, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2306, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2323, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2340, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2357, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2374, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2391, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2408, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2425, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2442, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2459, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1174, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1190, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1207, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1224, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1241, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1255, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1272, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1289, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1306, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1323, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1340, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1357, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1374, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1391, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1408, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1425, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1441, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1458, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1475, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1492, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1509, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1526, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1540, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1557, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1574, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1591, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1608, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1625, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1642, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1658, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1675, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1692, .adv_w = 192, .box_w = 9, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1706, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1723, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1740, .adv_w = 192, .box_w = 9, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 1754, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1771, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1788, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1805, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1822, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1839, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1856, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1873, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1890, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1907, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1924, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1941, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1958, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1975, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 1992, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2009, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2026, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2043, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2060, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2077, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2094, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2111, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2128, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2145, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2161, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 2174, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2191, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2207, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2224, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2238, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2254, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2271, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2288, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2305, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2322, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2339, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2356, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2373, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2390, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2407, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2424, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2441, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2458, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2475, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2491, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2508, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2525, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2542, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2559, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2576, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2593, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2610, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2627, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2644, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2661, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2678, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2695, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2712, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2729, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2746, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2760, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2777, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2794, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2811, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 2826, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2843, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2860, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2877, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2893, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2910, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2926, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2943, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2960, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2977, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 2994, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3011, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3028, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3045, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3062, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3079, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3096, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3113, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3130, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3147, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3164, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3181, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3198, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3215, .adv_w = 192, .box_w = 9, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 3229, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3246, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3263, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3280, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3297, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3314, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3331, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3348, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3365, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3382, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3399, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3416, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3433, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3450, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3467, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3484, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3501, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3518, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3535, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3552, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3569, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3586, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3603, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3620, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3637, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3654, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3671, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3688, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3705, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3722, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3739, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3756, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3773, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3790, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3807, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3823, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3840, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3857, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3874, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3891, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3908, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3925, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3942, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 3959, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 3974, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 3989, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 4004, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4021, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4038, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4055, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4072, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4089, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2491, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2507, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2524, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2541, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2558, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2575, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2592, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2609, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2626, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2643, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2660, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2677, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2694, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2711, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2728, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2745, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2762, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2776, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2793, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2810, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2827, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 2842, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2859, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2876, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2893, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2909, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2926, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2942, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2959, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2976, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 2993, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3010, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3027, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3044, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3061, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3078, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3095, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3112, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3129, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3146, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3163, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3180, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3197, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3214, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3231, .adv_w = 192, .box_w = 9, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 3245, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3262, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3279, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3296, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3313, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3330, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3347, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3364, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3381, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3398, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3415, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3432, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3449, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3466, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3483, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3500, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3517, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3534, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3551, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3568, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3585, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3602, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3619, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3636, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3653, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3670, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3687, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3704, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3721, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3738, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3755, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3772, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3789, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3806, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3823, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3839, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3856, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3873, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3890, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3907, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3924, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3941, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3958, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3975, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 3992, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 4007, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 4022, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 4037, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4054, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4071, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4088, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4105, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4122, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4139, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4156, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4173, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4190, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, - {.bitmap_index = 4207, .adv_w = 192, .box_w = 2, .box_h = 4, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 4208, .adv_w = 192, .box_w = 2, .box_h = 6, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 4210, .adv_w = 165, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = -1} /* U+25B6 */ + {.bitmap_index = 4122, .adv_w = 192, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4138, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4155, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4172, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4189, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4206, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4223, .adv_w = 192, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 4240, .adv_w = 192, .box_w = 2, .box_h = 4, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 4241, .adv_w = 192, .box_w = 2, .box_h = 6, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 4243, .adv_w = 165, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = -1} /* U+25B6 */ }; /*--------------------- @@ -1744,30 +1755,30 @@ static const uint16_t unicode_list_1[] = { 0x2e81, 0x2edc, 0x3005, 0x300c, 0x3011, 0x3013, 0x3039, 0x309a, 0x30a6, 0x30d6, 0x30ea, 0x30ed, 0x3141, 0x3148, 0x31b6, 0x31da, 0x322b, 0x323f, 0x3262, 0x326c, 0x3271, 0x3276, 0x3283, 0x328f, - 0x3297, 0x32a8, 0x32cc, 0x32cf, 0x32ea, 0x3308, 0x3508, 0x357e, - 0x3580, 0x3594, 0x35d0, 0x35e0, 0x362b, 0x367f, 0x37a7, 0x37ad, - 0x37b6, 0x37d1, 0x39f0, 0x39f7, 0x39f8, 0x3a3a, 0x3a3e, 0x3a66, - 0x3c92, 0x3cc7, 0x3cd8, 0x3d14, 0x3d2f, 0x3d46, 0x3d96, 0x3da0, - 0x3da2, 0x3daf, 0x3db5, 0x3dda, 0x3df2, 0x3df3, 0x3df5, 0x3ea1, - 0x3edb, 0x3f02, 0x3f0f, 0x40d7, 0x40eb, 0x4135, 0x4136, 0x4144, - 0x4145, 0x420e, 0x4229, 0x4245, 0x4247, 0x4249, 0x436d, 0x43d6, - 0x43de, 0x43e5, 0x43e8, 0x4410, 0x4414, 0x4480, 0x4485, 0x4496, - 0x44de, 0x45a0, 0x45a8, 0x45ad, 0x45bf, 0x45ca, 0x45cc, 0x45da, - 0x461f, 0x4685, 0x46a7, 0x46c1, 0x46d7, 0x4760, 0x48c1, 0x49c0, - 0x49c1, 0x4a03, 0x4a1b, 0x4a55, 0x4ae2, 0x4b00, 0x4b82, 0x4be1, - 0x4beb, 0x4c28, 0x4ca5, 0x4cc9, 0x4f59, 0x50e7, 0x50e8, 0x5156, - 0x5177, 0x518c, 0x53c8, 0x53d5, 0x53ec, 0x5571, 0x5594, 0x55ab, - 0x5685, 0x56a1, 0x570c, 0x570e, 0x57da, 0x5872, 0x58ab, 0x5937, - 0x596b, 0x5979, 0x598f, 0x59cc, 0x5b1b, 0x5b9b, 0x5d5f, 0x5d68, - 0x5d7f, 0x5d8d, 0x5d94, 0x5df1, 0x5e0e, 0x5fba, 0x608a, 0x6122, - 0x614f, 0x61a3, 0x6217, 0x66ec, 0x6765, 0x6a06, 0x6a41, 0x6a44, - 0x6a4f, 0x6a50, 0x6a5e, 0x6a82, 0x6a85, 0x6a8f, 0x6a97, 0x6a9b, - 0x6bbf, 0x6bc5, 0x6c2a, 0x6c93, 0x6e0f, 0x6e1d, 0x6e33, 0x6e67, - 0x6e70, 0x6e71, 0x6e74, 0x6ea0, 0x6ea1, 0x6eba, 0x6ef3, 0x6f05, - 0x6f88, 0x6fed, 0x7067, 0x706d, 0x706f, 0x733f, 0x7345, 0x73a1, - 0x73b9, 0x741f, 0x7488, 0x748d, 0x7494, 0x7498, 0x74d2, 0x7504, - 0x753c, 0x7596, 0x7602, 0x7715, 0x7731, 0x7828, 0x7836, 0x792c, - 0x7d78, 0xddac, 0xddba + 0x3297, 0x32a8, 0x32cc, 0x32cf, 0x32d8, 0x32ea, 0x3308, 0x3508, + 0x357e, 0x3580, 0x3594, 0x35d0, 0x35e0, 0x362b, 0x367f, 0x37a7, + 0x37ad, 0x37b6, 0x37d1, 0x39f0, 0x39f7, 0x39f8, 0x3a3a, 0x3a3e, + 0x3a66, 0x3c92, 0x3cc7, 0x3cd8, 0x3d14, 0x3d2f, 0x3d46, 0x3d96, + 0x3da0, 0x3da2, 0x3daf, 0x3db5, 0x3dda, 0x3df2, 0x3df3, 0x3df5, + 0x3ea1, 0x3edb, 0x3f02, 0x3f0f, 0x40d7, 0x40eb, 0x4135, 0x4136, + 0x4144, 0x4145, 0x420e, 0x4229, 0x4245, 0x4247, 0x4249, 0x436d, + 0x43d6, 0x43de, 0x43e5, 0x43e8, 0x4410, 0x4414, 0x4480, 0x4485, + 0x4496, 0x44de, 0x45a0, 0x45a8, 0x45ad, 0x45bf, 0x45ca, 0x45cc, + 0x45da, 0x461f, 0x4685, 0x46a7, 0x46c1, 0x46d7, 0x4760, 0x48c1, + 0x49c0, 0x49c1, 0x4a03, 0x4a1b, 0x4a55, 0x4ae2, 0x4b00, 0x4b82, + 0x4be1, 0x4beb, 0x4c28, 0x4ca5, 0x4cc9, 0x4f59, 0x50e7, 0x50e8, + 0x5156, 0x5177, 0x518c, 0x53c8, 0x53d5, 0x53ec, 0x5571, 0x5594, + 0x55ab, 0x5685, 0x56a1, 0x570c, 0x570e, 0x57da, 0x5872, 0x58ab, + 0x5937, 0x596b, 0x5979, 0x598f, 0x59cc, 0x5b1b, 0x5b9b, 0x5d5f, + 0x5d68, 0x5d7f, 0x5d8d, 0x5d94, 0x5df1, 0x5e0e, 0x5fba, 0x608a, + 0x6122, 0x614f, 0x61a3, 0x6217, 0x66ec, 0x6765, 0x6a06, 0x6a41, + 0x6a44, 0x6a4f, 0x6a50, 0x6a5e, 0x6a82, 0x6a85, 0x6a8f, 0x6a97, + 0x6a9b, 0x6bbf, 0x6bc5, 0x6c2a, 0x6c93, 0x6e0f, 0x6e1d, 0x6e33, + 0x6e67, 0x6e70, 0x6e71, 0x6e74, 0x6ea0, 0x6ea1, 0x6eba, 0x6ef3, + 0x6f05, 0x6f88, 0x6fed, 0x7067, 0x706a, 0x706d, 0x706f, 0x733f, + 0x7345, 0x73a1, 0x73b9, 0x741f, 0x7488, 0x748d, 0x7494, 0x7498, + 0x74d2, 0x7504, 0x753c, 0x7596, 0x7602, 0x7715, 0x7731, 0x7828, + 0x7836, 0x792c, 0x7d78, 0xddac, 0xddba }; /*Collect the unicode lists and glyph_id offsets*/ @@ -1778,12 +1789,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY }, { - .range_start = 9654, .range_length = 1, .glyph_id_start = 323, + .range_start = 9654, .range_length = 1, .glyph_id_start = 325, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY }, { .range_start = 8544, .range_length = 56763, .glyph_id_start = 96, - .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 227, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 229, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY } }; diff --git a/Drivers/BSP/UI/ui_menu_tab.c b/Drivers/BSP/UI/ui_menu_tab.c index f84ef76f..25badb4c 100644 --- a/Drivers/BSP/UI/ui_menu_tab.c +++ b/Drivers/BSP/UI/ui_menu_tab.c @@ -18,43 +18,44 @@ const ui_menu_node_t g_menu_tab[UI_MENU_TAB_COUNT] = { { 2, 0u, "交流量" }, /* 3 二级菜单 */ { 2, 0u, "直流量" }, /* 4 二级菜单 */ { 2, 0u, "遥信量" }, /* 5 二级菜单 */ - { 0, 0u, "参数定值" }, /* 6 一级菜单 */ - { 6, 0u, "整定" }, /* 7 二级菜单 */ - { 7, 1u, "参数" }, /* 8 三级菜单 */ - { 7, 1u, "定值" }, /* 9 三级菜单 */ - { 7, 1u, "控制字" }, /* 10 三级菜单 */ - { 7, 1u, "软压板" }, /* 11 三级菜单 */ - { 6, 0u, "查看" }, /* 12 二级菜单 */ - { 12, 0u, "参数" }, /* 13 三级菜单 */ - { 12, 0u, "定值" }, /* 14 三级菜单 */ - { 12, 0u, "控制字" }, /* 15 三级菜单 */ - { 12, 0u, "软压板" }, /* 16 三级菜单 */ - { 0, 0u, "三遥设置" }, /* 17 一级菜单 */ - { 17, 1u, "遥测死区" }, /* 18 二级菜单 */ - { 17, 1u, "遥测系数" }, /* 19 二级菜单 */ - { 17, 1u, "遥信类型" }, /* 20 二级菜单 */ - { 17, 1u, "遥信防抖" }, /* 21 二级菜单 */ - { 17, 1u, "双点遥信" }, /* 22 二级菜单 */ - { 0, 0u, "装置维护" }, /* 23 一级菜单 */ - { 23, 1u, "时钟设置" }, /* 24 二级菜单 */ - { 23, 1u, "强制复归" }, /* 25 二级菜单 */ - { 23, 1u, "手动录波" }, /* 26 二级菜单 */ - { 23, 1u, "清除记录" }, /* 27 二级菜单 */ - { 0, 0u, "通讯参数" }, /* 28 一级菜单 */ - { 28, 1u, "通讯设置" }, /* 29 二级菜单 */ - { 28, 1u, "网口设置" }, /* 30 二级菜单 */ - { 28, 1u, "SNTP设置" }, /* 31 二级菜单 */ - { 0, 0u, "记录查询" }, /* 32 一级菜单 */ - { 32, 0u, "SOE记录" }, /* 33 二级菜单 */ - { 32, 0u, "事故记录" }, /* 34 二级菜单 */ - { 32, 0u, "操作记录" }, /* 35 二级菜单 */ - { 32, 0u, "保护告警" }, /* 36 二级菜单 */ - { 32, 0u, "保护启动" }, /* 37 二级菜单 */ - { 32, 0u, "遥控记录" }, /* 38 二级菜单 */ - { 32, 0u, "自检记录" }, /* 39 二级菜单 */ - { 32, 0u, "运行记录" }, /* 40 二级菜单 */ - { 32, 0u, "运行报告" }, /* 41 二级菜单 */ - { 32, 0u, "录波回放" }, /* 42 二级菜单 */ + { 2, 0u, "开入开出" }, /* 6 二级菜单 */ + { 0, 0u, "参数定值" }, /* 7 一级菜单 */ + { 7, 0u, "整定" }, /* 8 二级菜单 */ + { 8, 1u, "参数" }, /* 9 三级菜单 */ + { 8, 1u, "定值" }, /* 10 三级菜单 */ + { 8, 1u, "控制字" }, /* 11 三级菜单 */ + { 8, 1u, "软压板" }, /* 12 三级菜单 */ + { 7, 0u, "查看" }, /* 13 二级菜单 */ + { 13, 0u, "参数" }, /* 14 三级菜单 */ + { 13, 0u, "定值" }, /* 15 三级菜单 */ + { 13, 0u, "控制字" }, /* 16 三级菜单 */ + { 13, 0u, "软压板" }, /* 17 三级菜单 */ + { 0, 0u, "三遥设置" }, /* 18 一级菜单 */ + { 18, 1u, "遥测死区" }, /* 19 二级菜单 */ + { 18, 1u, "遥测系数" }, /* 20 二级菜单 */ + { 18, 1u, "遥信类型" }, /* 21 二级菜单 */ + { 18, 1u, "遥信防抖" }, /* 22 二级菜单 */ + { 18, 1u, "双点遥信" }, /* 23 二级菜单 */ + { 0, 0u, "装置维护" }, /* 24 一级菜单 */ + { 24, 1u, "时钟设置" }, /* 25 二级菜单 */ + { 24, 1u, "强制复归" }, /* 26 二级菜单 */ + { 24, 1u, "手动录波" }, /* 27 二级菜单 */ + { 24, 1u, "清除记录" }, /* 28 二级菜单 */ + { 0, 0u, "通讯参数" }, /* 29 一级菜单 */ + { 29, 1u, "通讯设置" }, /* 30 二级菜单 */ + { 29, 1u, "网口设置" }, /* 31 二级菜单 */ + { 29, 1u, "SNTP设置" }, /* 32 二级菜单 */ + { 0, 0u, "记录查询" }, /* 33 一级菜单 */ + { 33, 0u, "SOE记录" }, /* 34 二级菜单 */ + { 33, 0u, "事故记录" }, /* 35 二级菜单 */ + { 33, 0u, "操作记录" }, /* 36 二级菜单 */ + { 33, 0u, "保护告警" }, /* 37 二级菜单 */ + { 33, 0u, "保护启动" }, /* 38 二级菜单 */ + { 33, 0u, "遥控记录" }, /* 39 二级菜单 */ + { 33, 0u, "自检记录" }, /* 40 二级菜单 */ + { 33, 0u, "运行记录" }, /* 41 二级菜单 */ + { 33, 0u, "运行报告" }, /* 42 二级菜单 */ + { 33, 0u, "录波回放" }, /* 43 二级菜单 */ }; /* diff --git a/Drivers/BSP/UI/ui_menu_tab.h b/Drivers/BSP/UI/ui_menu_tab.h index 24053433..635cbcd2 100644 --- a/Drivers/BSP/UI/ui_menu_tab.h +++ b/Drivers/BSP/UI/ui_menu_tab.h @@ -25,7 +25,7 @@ typedef struct { const char *name; /* 显示文本(字面量,存 Flash) */ } ui_menu_node_t; -#define UI_MENU_TAB_COUNT 43 +#define UI_MENU_TAB_COUNT 44 /* 护栏:8 位索引上限 255 项(哨兵 0xFF 占用 255);超界则编译失败(C99 写法,兼容 ARMCC v5) */ typedef char menu_tab_count_check[(UI_MENU_TAB_COUNT <= 255) ? 1 : -1]; diff --git a/Drivers/BSP/UI/ui_page_di_do.c b/Drivers/BSP/UI/ui_page_di_do.c new file mode 100644 index 00000000..a1d445d3 --- /dev/null +++ b/Drivers/BSP/UI/ui_page_di_do.c @@ -0,0 +1,231 @@ +/* + * 模块名称:UI Page DI DO (开入开出内容页) + * 模块功能:实时数据 → 开入开出 叶子的只读状态页——12 行竖向列表,每行一路通道: + * 前 8 行是板上的 8 路开入(DI_A..DI_H),后 4 行是 4 路开出(KO6/TRIP/ERT/CLZ); + * 名 + 值两列,8 行一页共 2 页;数据只读 Drivers/BSP/UI/ui_data.h 的实时快照, + * 零 App include、零 LVGL 对象(框架按描述符整页自绘) + * 为什么 12 行按「8 开入 + 4 开出」切开而不是混排:8 行一页的窗口恰好让第 1 页全是开入、 + * 第 2 页全是开出——两类信号各占一页,操作员不用在一页里跨类对照;第 2 页只有 + * 4 行、下方留白是页数决定的(12 行 / 每页 8 行),页脚"第 2 页,共 2 页"已说明 + * 这是最后一页,故不再加提示行(多一行提示就要多扩一个汉字字模) + * 为什么开出写「吸合 / 释放」而开入写「合 / 分」:开出的"1"是继电器线圈被驱动,业内固定 + * 说法就是吸合与释放;开入的"1"是外部触点闭合,屏上沿用遥信页的"合位/分位"口径 + * 但省掉"位"字——值列只有一格,短词读得更快 + * 这张屏能看到什么、看不到什么(务必与下一段一起读,屏上的"吸合"不等于继电器真吸合): + * 1. 开出这几行显示的是**软件影子寄存器**(ODR 镜像),也就是"我们让这一路吸合了", + * 不是继电器机械触点真的闭合了的实测反馈——本平台的硬件没有辅助触点回读通路。 + * 2. 驱动里的 ioboard_do_read_level() 读的同样是 ODR,所以它读回来与本页的值恒等; + * 它只用来发现"有人在驱动之外写了这 4 根引脚的 ODR",不能证明光耦导通或触点真闭合。 + * 验证步骤见 Drivers/BSP/IOBOARD/README.md 第 5 节第 2 步。 + * 3. 开出极性宏 IOBOARD_DO_LEVEL_ACTIVE(Drivers/BSP/IOBOARD/ioboard.h)写明是"唯一可改点", + * **尚未按原理图核对**——若硬件实际是低电平吸合,屏上的"吸合"仍是对的(软件 mask 语义, + * 极性在驱动层换),但驱动改动之前本页结论只能算"按软件意图显示"。 + * 4. 开入这 8 路**位序没有经过人工短接验证**:2026-11-16 那轮实测 8 路读回全是 0x00, + * 原因是操作员没来得及逐路短接(不是驱动故障),所以 DI_A..DI_H 与物理端子的对应 + * 关系目前只是按驱动位序(bit0 = 通道 A … bit7 = 通道 H)推定,未经现场核对。 + * 验证方法见 docs/硬件平台/开入开出实施说明.md §5.1(只有 A 动作 → 0x01 / 只有 H 动作 → 0x80)。 + * 5. 本页与 33 点遥信(ui_data_rt_t 的 yx_bits/yx_valid/yx_dp)**没有任何映射关系**:那是 + * 104 点表的语义,板级开入尚未接进点表(docs/架构设计/硬件规格与能力边界.md 的 H3 能力 + * 边界)。本页只显示板级原始状态,不冒充点表事实。 + * 为什么值是「--」而不是「分 / 释放」:valid 为 0 表示"这一路没有可信读数"。此时 mask 里可能 + * 还留着上一次的值,把它画成"分"或"释放"等于把"没数据"伪装成"已复归"——现场会 + * 因此以为开入全部断开。这是本仓"读失败不得当全 0 上报"铁律在屏上的落点。 + * 上真板子时开出这几行会正常显示「吸合 / 释放」,不会一直是「--」:板端 App/app/ui_data_feed.c + * 经 ioboard_do_get() 取得到影子寄存器,dio_do_valid 恒为 1;只有 PC 模拟器构建没有 + * ioboard 硬件、影子取不到时才恒为 0,于是开出四行显示「--」。上板看到「--」先查 + * feed 侧是否在跑,不要去改本页的判定——本页只认 valid 位。 + * 适用平台:STM32F407ZGTx / PC 模拟器(共用源码) + * 作者:王建锋 + * 创建日期:2026-11-16 + * 修改记录: + * v1.0 2026-11-16 DTU 项目组 创建(开入开出上屏:8 路开入 + 4 路开出只读页) + */ +/* 头文件包含区 */ + +#include "ui_page_di_do.h" + +#include + +#include "ui_data.h" +#include "ui_tokens.h" + +/* 私有宏定义区 */ + +#define DIO_DI_N 8u /* 开入路数(一块 74HC165 的 A..H) */ +#define DIO_DO_N 4u /* 开出路数(KO6 / TRIP / ERT / CLZ) */ +#define DIO_ROW_N (DIO_DI_N + DIO_DO_N) + +/* 值列词表(「吸」「释」两字 2026-11-16 随本页扩进 ui_font_cn_12,其余原在子集内) */ +#define DIO_INVALID "--" +#define DIO_DI_ON "合" +#define DIO_DI_OFF "分" +#define DIO_DO_ON "吸合" +#define DIO_DO_OFF "释放" + +/* 静态变量定义区 */ + +/* + * 行名表(下标 = 全局行号 0..11) + * 开入名取板级通道丝印 DI_A..DI_H:仓库里查不到这 8 路的功能语义名(断路器位置、压板投退之类 + * 都是点表层的说法,板级开入还没接进点表,见文件头第 5 条),故如实写丝印名,**不编造功能名** + * ——与遥信页对点表未定义点写 YX5..YX14 是同一条口径(ui_page_yx.c 名表注释)。 + * 开出名照抄丝印 KO6/TRIP/ERT/CLZ,与 ioboard.h 的 IOBOARD_DO_* 宏一一对应;宏注释已写明这些 + * 名字"只作追溯,不是业务定义",屏上因此不写"跳闸/告警/闭锁"——那三个动作的语义属于业务层。 + */ +static const char *const s_dio_name[DIO_ROW_N] = { + "DI_A", "DI_B", "DI_C", "DI_D", /* 0~3 开入通道 A..D */ + "DI_E", "DI_F", "DI_G", "DI_H", /* 4~7 开入通道 E..H */ + "KO6", "TRIP", "ERT", "CLZ", /* 8~11 开出 DO0..DO3 */ +}; + +/* 名表行数与页面行数一致(不一致 = 编译期错误;ARMCC C99 无 _Static_assert,用宽度法) */ +typedef char dio_name_count_check[(sizeof(s_dio_name) / sizeof(s_dio_name[0]) == DIO_ROW_N) ? 1 : -1]; + +/* 帧缓存:只在发布序号变化时整帧拷一次(同遥信页口径,UI_数据供给设计说明.md §5.4) */ +static ui_data_rt_t s_rt; +static uint32_t s_seq = 0xFFFFFFFFu; + +/* 函数定义区 */ + +/* + * 函数功能:定长缓冲内拷字面量(代码规范 7.5 禁 strcpy) + * 入口参数:a_dst - 目标缓冲(框架行缓冲 UI_BUF_STRLEN) char * + * a_src - 源串(含 NUL) const char * + * len - 目标缓冲容量 uint32_t + * 返回值:无 + * 限定条件:源串长度必须小于 len(编译期由字面量 sizeof 保证,不做运行期截断—— + * 截断只会把"吸合"打成"吸",比读错更难查) + */ +static void dio_put(char *a_dst, const char *a_src, uint32_t len) { + uint32_t i = 0u; + + if (len == 0u) { + return; + } + while (((i + 1u) < len) && (a_src[i] != '\0')) { + a_dst[i] = a_src[i]; + i++; + } + a_dst[i] = '\0'; +} + +/* + * 长度参数**必须取目标缓冲容量**,不能取 sizeof(源):本表的源是 `const char *const` 表里的 + * **指针**,`sizeof(lit)` 得到的是指针宽度(4/8),于是 "吸合" 会被拷成第一个汉字 "吸"。 + * 这个错编译器、cppcheck、编码钩子都不会响——遥信页(ui_page_yx.c 同名宏注释)就是被像素 + * 文本断言揪出来的。照抄坑的结论而不是坑的写法。 + */ +#define DIO_PUT(dst, lit) dio_put((dst), (lit), (uint32_t)UI_BUF_STRLEN) + +/* + * 函数功能:开页复位帧缓存(接框架 init_cb) + * 入口参数:无 + * 返回值:无 + * 限定条件:框架开页链内(uiTask) + * 函数说明:序号必须复位——否则重开本页会沿用上次开页的帧号,首帧之前的 "--" 可能被永久 + * 留在屏上(遥信页踩过的同一条纪律) + */ +static void pg_init(void) { + s_seq = 0xFFFFFFFFu; + (void)memset(&s_rt, 0, sizeof(s_rt)); +} + +/* + * 函数功能:按发布序号刷新帧缓存 + * 入口参数:无 + * 返回值:无 + * 限定条件:uiTask 绘制链内(refresh 前) + * 函数说明:ui_data_rt() 的通道是 0=成功 / -1=尚无首帧(不是 bool 成败);失败时把序号打回 + * 不可能的值,下一轮一定重试,不会停在半新不旧的帧上 + */ +static void pg_sync(void) { + uint32_t seq = ui_data_rt_seq(); + + if ((seq == s_seq) && (s_rt.valid != 0u)) { + return; + } + if (ui_data_rt(&s_rt) != 0) { + s_seq = 0xFFFFFFFFu; + (void)memset(&s_rt, 0, sizeof(s_rt)); + return; + } + s_seq = seq; +} + +/* + * 函数功能:总行数(固定 12 行,不随有效性增减) + * 入口参数:无 + * 返回值:行数 uint16_t + * 限定条件:框架绘制/翻页链内 + * 函数说明:故意返回常量——通道是硬件定数,行数随数据漂会让页数与黄金参考一起漂, + * 也会让现场看不出"这一路到底存不存在" + */ +static uint16_t pg_count(void) { + return (uint16_t)DIO_ROW_N; +} + +/* + * 函数功能:逐行取数(名 = 固定名表,值 = 开入/开出 mask 的一位) + * 入口参数:a_row - 行下标(0..11) uint16_t + * a_name - 名输出缓冲(UI_BUF_STRLEN) char * + * a_value - 值输出缓冲 char * + * 返回值:无 + * 限定条件:框架绘制链内(本函数无副作用) + * 函数说明:判定顺序是"先无效、再位值"——valid 为 0 时 mask 里可能仍是旧值(ui_data.h 的 + * dio_di_valid 注),位值此时不可消费,必须画 "--";只有 valid 为 1 才解释那一位 + */ +static void pg_refresh(uint16_t a_row, char *a_name, char *a_value) { + uint8_t bit; + + a_value[0] = '\0'; + if (a_row >= (uint16_t)DIO_ROW_N) { + a_name[0] = '\0'; + return; /* 防御:行号越界不越读名表(count 恒 12,走不到) */ + } + pg_sync(); + DIO_PUT(a_name, s_dio_name[a_row]); + + if (a_row < (uint16_t)DIO_DI_N) { + if ((s_rt.valid == 0u) || (s_rt.dio_di_valid == 0u)) { + DIO_PUT(a_value, DIO_INVALID); + return; + } + bit = (uint8_t)((s_rt.dio_di_mask >> (uint8_t)a_row) & 0x01u); + DIO_PUT(a_value, (bit != 0u) ? DIO_DI_ON : DIO_DI_OFF); + return; + } + + if ((s_rt.valid == 0u) || (s_rt.dio_do_valid == 0u)) { + DIO_PUT(a_value, DIO_INVALID); + return; + } + bit = (uint8_t)((s_rt.dio_do_mask >> (uint8_t)(a_row - (uint16_t)DIO_DI_N)) & 0x01u); + DIO_PUT(a_value, (bit != 0u) ? DIO_DO_ON : DIO_DO_OFF); +} + +/* + * 页面描述符(外部链接:生成物 ui_page_registry.c 按菜单树 #page=di_do 绑定引用): + * 12 行的动态页(rows=NULL + count_cb/refresh),8 行/页 = 2 页;几何全取 UI_TOKENS 列表原型, + * 与交流量/遥信量页同骨架——首行 y=24,第 8 行 y=122、行带 y2=135,页脚在 y=143,不相撞。 + * band_h 必须 >0(selectable 页选中行是黑字,无白带即不可见) + */ +const content_page_def_t ui_page_di_do_desc = { + .id = "di_do", + .title = "开入开出", + .selectable = 1u, + .top_y = UI_LIST_TOP, + .pitch = UI_ROW_PITCH, + .band_h = UI_ROW_BAND_H, + .text_dy = 0, + .left_x = UI_LIST_LEFT_X, + .right_x = UI_LIST_RIGHT_X, + .rows_per_page = UI_LIST_ROWS, + .init_cb = pg_init, + .count_cb = pg_count, + .refresh = pg_refresh, + /* 自动失效轮询(机制见 ui_content_page.h 的 auto_ms 注;口径见供给说明 §5.5): + * 开入变位与开出动作都是低频事件,屏上可见变化只在 rt 帧(200ms 拍)落地时发生;周期取 + * 500ms 与遥信页同档——变位"1s 内上屏"够用(最坏 200 + 500 = 700ms 到位), + * 500 = 25 × LVGL 整刷周期 20ms,落整刷边界 */ + .auto_ms = 500u, +}; diff --git a/Drivers/BSP/UI/ui_page_di_do.h b/Drivers/BSP/UI/ui_page_di_do.h new file mode 100644 index 00000000..20f6558d --- /dev/null +++ b/Drivers/BSP/UI/ui_page_di_do.h @@ -0,0 +1,26 @@ +/* + * 模块名称:UI Page DI DO (开入开出内容页) + * 模块功能:实时数据 → 开入开出 叶子的内容页声明——向框架 ui_content_page 提供页面描述符 + * 适用平台:STM32F407ZGTx / PC 模拟器(两端共用) + * 作者:王建锋 + * 创建日期:2026-11-16 + * 修改记录: + * v1.0 2026-11-16 DTU 项目组 创建(8 路开入 + 4 路开出只读状态页,12 行 / 8 行每页) + */ +#ifndef UI_PAGE_DI_DO_H +#define UI_PAGE_DI_DO_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "ui_content_page.h" + +/* 页面描述符(定义在 ui_page_di_do.c;生成物按菜单树 #page=di_do 引用本符号) */ +extern const content_page_def_t ui_page_di_do_desc; + +#ifdef __cplusplus +} +#endif + +#endif /* UI_PAGE_DI_DO_H */ diff --git a/Drivers/BSP/UI/ui_page_registry.c b/Drivers/BSP/UI/ui_page_registry.c index 9e079834..af9304fe 100644 --- a/Drivers/BSP/UI/ui_page_registry.c +++ b/Drivers/BSP/UI/ui_page_registry.c @@ -19,6 +19,7 @@ #include "ui_page_dc.h" #include "ui_page_deadband.h" #include "ui_page_device_info.h" +#include "ui_page_di_do.h" #include "ui_page_net_cfg.h" #include "ui_page_oper.h" #include "ui_page_password.h" @@ -43,33 +44,34 @@ const ui_page_entry_t g_ui_page_map[UI_PAGE_MAP_COUNT] = { { 3u, &ui_page_ac_desc }, /* node 3 交流量 */ { 4u, &ui_page_dc_desc }, /* node 4 直流量 */ { 5u, &ui_page_yx_desc }, /* node 5 遥信量 */ - { 8u, &ui_page_view_param_desc }, /* node 8 参数 */ - { 9u, &ui_page_view_set_desc }, /* node 9 定值 */ - { 10u, &ui_page_view_word_desc }, /* node 10 控制字 */ - { 11u, &ui_page_view_plate_desc }, /* node 11 软压板 */ - { 13u, &ui_page_view_param_desc }, /* node 13 参数 */ - { 14u, &ui_page_view_set_desc }, /* node 14 定值 */ - { 15u, &ui_page_view_word_desc }, /* node 15 控制字 */ - { 16u, &ui_page_view_plate_desc }, /* node 16 软压板 */ - { 18u, &ui_page_deadband_desc }, /* node 18 遥测死区 */ - { 19u, &ui_page_calib_desc }, /* node 19 遥测系数 */ - { 24u, &ui_page_clock_desc }, /* node 24 时钟设置 */ - { 25u, &ui_page_reset_desc }, /* node 25 强制复归 */ - { 26u, &ui_page_wave_manual_desc }, /* node 26 手动录波 */ - { 27u, &ui_page_clear_desc }, /* node 27 清除记录 */ - { 29u, &ui_page_comm_desc }, /* node 29 通讯设置 */ - { 30u, &ui_page_net_cfg_desc }, /* node 30 网口设置 */ - { 31u, &ui_page_sntp_desc }, /* node 31 SNTP设置 */ - { 33u, &ui_page_soe_desc }, /* node 33 SOE记录 */ - { 34u, &ui_page_accident_desc }, /* node 34 事故记录 */ - { 35u, &ui_page_oper_desc }, /* node 35 操作记录 */ - { 36u, &ui_page_alarm_desc }, /* node 36 保护告警 */ - { 37u, &ui_page_start_desc }, /* node 37 保护启动 */ - { 38u, &ui_page_yk_desc }, /* node 38 遥控记录 */ - { 39u, &ui_page_selftest_desc }, /* node 39 自检记录 */ - { 40u, &ui_page_runlog_desc }, /* node 40 运行记录 */ - { 41u, &ui_page_runreport_desc }, /* node 41 运行报告 */ - { 42u, &ui_page_wave_play_desc }, /* node 42 录波回放 */ + { 6u, &ui_page_di_do_desc }, /* node 6 开入开出 */ + { 9u, &ui_page_view_param_desc }, /* node 9 参数 */ + { 10u, &ui_page_view_set_desc }, /* node 10 定值 */ + { 11u, &ui_page_view_word_desc }, /* node 11 控制字 */ + { 12u, &ui_page_view_plate_desc }, /* node 12 软压板 */ + { 14u, &ui_page_view_param_desc }, /* node 14 参数 */ + { 15u, &ui_page_view_set_desc }, /* node 15 定值 */ + { 16u, &ui_page_view_word_desc }, /* node 16 控制字 */ + { 17u, &ui_page_view_plate_desc }, /* node 17 软压板 */ + { 19u, &ui_page_deadband_desc }, /* node 19 遥测死区 */ + { 20u, &ui_page_calib_desc }, /* node 20 遥测系数 */ + { 25u, &ui_page_clock_desc }, /* node 25 时钟设置 */ + { 26u, &ui_page_reset_desc }, /* node 26 强制复归 */ + { 27u, &ui_page_wave_manual_desc }, /* node 27 手动录波 */ + { 28u, &ui_page_clear_desc }, /* node 28 清除记录 */ + { 30u, &ui_page_comm_desc }, /* node 30 通讯设置 */ + { 31u, &ui_page_net_cfg_desc }, /* node 31 网口设置 */ + { 32u, &ui_page_sntp_desc }, /* node 32 SNTP设置 */ + { 34u, &ui_page_soe_desc }, /* node 34 SOE记录 */ + { 35u, &ui_page_accident_desc }, /* node 35 事故记录 */ + { 36u, &ui_page_oper_desc }, /* node 36 操作记录 */ + { 37u, &ui_page_alarm_desc }, /* node 37 保护告警 */ + { 38u, &ui_page_start_desc }, /* node 38 保护启动 */ + { 39u, &ui_page_yk_desc }, /* node 39 遥控记录 */ + { 40u, &ui_page_selftest_desc }, /* node 40 自检记录 */ + { 41u, &ui_page_runlog_desc }, /* node 41 运行记录 */ + { 42u, &ui_page_runreport_desc }, /* node 42 运行报告 */ + { 43u, &ui_page_wave_play_desc }, /* node 43 录波回放 */ }; /* diff --git a/Drivers/BSP/UI/ui_page_registry.h b/Drivers/BSP/UI/ui_page_registry.h index fd1e76ae..14c4c818 100644 --- a/Drivers/BSP/UI/ui_page_registry.h +++ b/Drivers/BSP/UI/ui_page_registry.h @@ -25,7 +25,7 @@ typedef struct { const content_page_def_t *desc; /* 页面描述符(Flash const) */ } ui_page_entry_t; -#define UI_PAGE_MAP_COUNT 31u /* 绑定了内容页的叶子数 */ +#define UI_PAGE_MAP_COUNT 32u /* 绑定了内容页的叶子数 */ extern const ui_page_entry_t g_ui_page_map[UI_PAGE_MAP_COUNT]; diff --git a/MDK-ARM/STM32F407-Demo.uvprojx b/MDK-ARM/STM32F407-Demo.uvprojx index 378294f1..81b52a54 100644 --- a/MDK-ARM/STM32F407-Demo.uvprojx +++ b/MDK-ARM/STM32F407-Demo.uvprojx @@ -4391,6 +4391,11 @@ 1 ..\Drivers\BSP\UI\ui_page_sntp.c + + ui_page_di_do.c + 1 + ..\Drivers\BSP\UI\ui_page_di_do.c + diff --git a/docs/UI设计/UI_数据供给设计说明.md b/docs/UI设计/UI_数据供给设计说明.md index 04b837d0..08223dbc 100644 --- a/docs/UI设计/UI_数据供给设计说明.md +++ b/docs/UI设计/UI_数据供给设计说明.md @@ -174,6 +174,11 @@ typedef struct { float freq_hz; uint8_t clock_ok; /* 0 = 时钟无效(RTC 异常) */ char clock[20]; /* "YYYY-MM-DD HH:MM:SS" 固定长度,无指针 */ + /* v3 尾追加:板级开入开出(「开入开出」页),与上面三张点表位图互不引用 */ + uint8_t dio_di_mask; /* 8 路开入:bit n = 通道 n 合 */ + uint8_t dio_di_valid; /* 0 = 无数据源 / 本次读失败(mask 为上次已知值,不可当新数据) */ + uint8_t dio_do_mask; /* 4 路开出影子寄存器:bit n = 吸合(**软件意图**,非机械反馈) */ + uint8_t dio_do_valid; /* 0 = 本帧未取到影子寄存器 */ } ui_data_rt_t; ``` @@ -194,7 +199,7 @@ typedef struct { ```c #define UI_DATA_SET_N 40u /* 定值项数(与 prot_set 枚举同序,见 §9.2 一致性测试) */ -#define UI_DATA_VER 2u /* 契约版本;字段只尾追加、追加即升版(§4.3) */ +#define UI_DATA_VER 3u /* 契约版本;字段只尾追加、追加即升版(§4.3) */ typedef struct { uint32_t seq; @@ -229,6 +234,22 @@ typedef struct { > (帧长一变,那处注释就是唯一会撒谎的地方)。升 `UI_DATA_VER` 是必须的:版本号是 > 页面与写侧唯一的对齐凭据,追加字段不升版 = 老页面按新帧长 memcpy 时静默错位。 +> 【v3 落地注(2026-11-16,「开入开出」页)】`ui_data_rt_t` 尾追加 +> `dio_di_mask` / `dio_di_valid` / `dio_do_mask` / `dio_do_valid`(板级 8 路开入 + +> 4 路开出),`UI_DATA_VER` 2 → 3。四条口径: +> 1. **板级引脚 ≠ 104 点表**:这四字段与 `yx_bits` / `yx_valid` / `yx_dp` 互不引用。 +> 板级开入 8 路与点表 33 点没有映射关系,把引脚状态塞进点表位图 = 篡改点表事实 +> (点表 YX1~4 开关位置点在 V0.1 仍恒无效)。 +> 2. **读失败语义**:开入经 `ioboard_di_snap_lookup()` → `ioboard_di_snap_read()` +> 取数。读不到(未登记 / 快照无效 / 读期被持续抢占)时 `dio_di_valid = 0`、mask +> 沿用**上一次成功读到的值**,绝不填 0——全 0 在现场等于"开入全部复归"。 +> 开出只读驱动影子寄存器(`ioboard_do_get()`),零硬件访问。 +> 3. **`dio_do_mask` 是软件意图**(上次成功写入的值),不是继电器机械吸合实测; +> 本平台无辅助触点回读通路,屏上文案不得让人以为读到了机械反馈。 +> 4. **尺寸**:4 字段偏移 208..211 连续,但整帧 208 → **216 B**(尾部 `char[20]` 后 +> 原有 4 B 对齐填充被顶满,再补 4 B 新填充)。组装缓冲 `s_scr` 以 rt 为最大者, +> 故 .bss 实涨 8 B。偏移与尺寸由 `test/host/ui_data` 的 TC-UIDATA-021g/i~j/o~r 钉住。 + ### 4.3 扩展规则 - **只允许尾部追加字段**,结构体开头保留 `seq/valid`。 diff --git a/simulator/CMakeLists.txt b/simulator/CMakeLists.txt index 22d1d1ee..2d479b9a 100644 --- a/simulator/CMakeLists.txt +++ b/simulator/CMakeLists.txt @@ -128,6 +128,7 @@ set(UI_SOURCES ${UI_DIR}/ui_page_wave_manual.c ${UI_DIR}/ui_page_wave_play.c ${UI_DIR}/ui_page_sntp.c + ${UI_DIR}/ui_page_di_do.c ) # 运行/自检记录引擎(双端共享核心 + 平台存储后端;MCU 端编 sys_log_mcu.c,见 Keil 工程) diff --git a/simulator/tests/check_content_pages.py b/simulator/tests/check_content_pages.py index 6016a320..188ee2cf 100644 --- a/simulator/tests/check_content_pages.py +++ b/simulator/tests/check_content_pages.py @@ -78,6 +78,12 @@ PAGES = [ # yxp2 再多按 8 次下移,让选中行跨过页边界落到第 2 页首行 ("yx", "dedde"), ("yxp2", "dedde dddddddd"), + # 开入开出(node 6,实时数据下第 4 项 = 遥信量之后):d 到实时数据 → e 进(选中交流量) + # → ddd 到开入开出 → e 开页。12 行 / 8 行每页 = 2 页:第 1 页是 8 路开入(DI_A..DI_H), + # 第 2 页是 4 路开出(KO6/TRIP/ERT/CLZ)+ 4 行空白;di_do_p2 再按 8 次下移让选中行 + # 落到 row 8 = 第 2 页窗口顶行(first = (8/8)*8),页脚随之变"第 2 页,共 2 页" + ("di_do", "deddd e"), + ("di_do_p2", "deddd e dddddddd"), # SOE 记录(node 51,记录查询下第 1 项):6 下进记录查询 → e → 首项 SOE记录 → e; # 数据 = simulator/main.c 的固定 3 条假记录(含 type 7 未标定闭锁这条非元件支路) ("soe", "dddddde e"), diff --git a/simulator/tests/check_menu_rows.py b/simulator/tests/check_menu_rows.py index 6aea74ea..7f3ab457 100644 --- a/simulator/tests/check_menu_rows.py +++ b/simulator/tests/check_menu_rows.py @@ -12,7 +12,7 @@ check_menu_rows.py — 自绘菜单 8 状态像素回归(160x160 I1,MSB-firs MENU-STATE-01 "d" sel=1 MENU-STATE-02 "dd" sel=2 MENU-STATE-03 "ddu" 回退 → 须与 MENU-STATE-01 全像素一致 - MENU-STATE-04 "de" 开 L2(实时数据 3 子项),根框不变 + MENU-STATE-04 "de" 开 L2(实时数据 4 子项),根框不变 MENU-STATE-05 "ded" L2 sel=1 MENU-STATE-06 "des" 返回 → 须与 MENU-STATE-01 全像素一致(销毁/重建一致性) MENU-STATE-07 "ddes" 根框 sel=2、L2 已毁 → 须与 MENU-STATE-02 全像素一致 @@ -90,10 +90,10 @@ def root_row_strip(i): return (ROOT_X0 + 1, ROOT_X0 + ROOT_W - 2, y1, y1 + ROW_H - 1) -def l2_geom(root_sel, cnt): +def l2_geom(root_sel, cnt, max_name_px=36): x0 = ROOT_X0 + ROOT_W - 1 # 65(共享边框列) y0 = ROOT_Y0 + 1 + root_sel * ROW_H # 顶对齐父框选中行行顶 - w = 42 # 2+36+2 + 2 边框(3 汉字行) + w = 2 + max_name_px + 2 + 2 # 左右内边距 + 最长名宽 + 2 边框 h = cnt * ROW_H + 2 return x0, y0, w, h @@ -182,11 +182,14 @@ def main(): for i in range(7): row_check(p, *root_row_strip(i), band=(i == sel), tag=name + "行%d" % i) - # --- MENU-STATE-04:L2 开于 sel=1 行右侧(3 子项、无箭头),根框区与 MENU-STATE-01 相同 --- + # --- MENU-STATE-04:L2 开于 sel=1 行右侧(实时数据 4 子项、无箭头),根框区与 MENU-STATE-01 相同 --- + # 子项数 4 = 交流量/直流量/遥信量/开入开出(node 6 于 2026-11-16 挂到实时数据下, + # 此前是 3 子项)。子项数与最长名宽都写进几何(h = cnt*15+2,w 随最长名 48 px + # 的「开入开出」变 54),菜单加减叶子必改这里。 p = S["MENU-STATE-04"] - lx0, ly0, lw, lh = l2_geom(1, 3) + lx0, ly0, lw, lh = l2_geom(1, 4, 48) border_check(p, lx0, ly0, lw, lh, "MENU-STATE-04-L2框") - for i in range(3): + for i in range(4): row_check(p, *l2_row_strip(lx0, ly0, i, lw), band=(i == 0), tag="MENU-STATE-04-L2行%d" % i) # 根框区(x 0..65)须与 MENU-STATE-01 逐像素一致 for y in range(H): @@ -198,8 +201,8 @@ def main(): # --- MENU-STATE-05:L2 sel=1,根框区仍与 MENU-STATE-01 同 --- p = S["MENU-STATE-05"] - lx0, ly0, lw, lh = l2_geom(1, 3) - for i in range(3): + lx0, ly0, lw, lh = l2_geom(1, 4, 48) + for i in range(4): row_check(p, *l2_row_strip(lx0, ly0, i, lw), band=(i == 1), tag="MENU-STATE-05-L2行%d" % i) for y in range(H): for x in range(0, ROOT_X0 + ROOT_W): diff --git a/simulator/tests/ref/shot_di_do.bin b/simulator/tests/ref/shot_di_do.bin new file mode 100644 index 0000000000000000000000000000000000000000..f10b9da2a68577d401482c1a2723ba1f4fd7ffcd GIT binary patch literal 3200 zcmd^>y-ve05P;8VL_1WFz`}rNiV&lm zMi?0)!o^KY>N_D93PQq5?XUNj^PO#g?~e|e7|olBQyJe)=9v#8-~EgUsT6#;_PfPQ zw=Yu78Xt!+V`X+-W+U}CT)>%{_`>sh$1|2eXfm|6so2oz4QshBK!3(ucewVZrmFxe zYBKIQV{p`T3jjsu#}z=QG)9IZ1}f#e+AppmGnBF{ShgKK8=^&Y9zPLw89yw_ULmej zis&-FXLKJ4JCAP(+m0wRgm8)9mc<6HOX-VA&(i~o#>Um3xf69l{bx zS)LveITj2gi@yr<6r02tiS!HtFqOfgtd$o#T|O_^ur_1qdC~i;z4P@#_j1bYZ;Q3^ zVyDab|3xn5WwKMzF@03VG4FTUutb|;=? z^&m!;i6#Q)6knqfned#3;jf1e-EJYg!AlKA37+d#x}K*mQ@>$>W=d`nqTI-Dz(2vwwS)hG zf}{Bl6kJ4u=QBTE+uR|=qEl|k_dfUD_g)^!CBXEfMi#-iO@E;Jci}km5%}^aCRCc> z;1B6Xx1I=Z>7~fkkWzl