feat(ui): fold board inputs and outputs into the telemetry page
The 12 board-level rows now live at the end of the 遥信量 page instead of a separate 开入开出 page: 8 opto inputs (DI_A..DI_H) and 4 relay outputs (KO6/TRIP/ERT/CLZ). 33 rows become 45, five pages become six. The standalone page, its menu entry, its golden references and both build registrations are removed. Folding the display is not folding the point table. The board rows render from dio_di_* / dio_do_* and stay out of yx_bits / yx_valid / yx_dp: any change to those carriers is provably absent from this diff. IEC 104 mapping and YX_VALID_MASK are untouched, so nothing new is reported to a master station. Input polarity was wrong and is fixed here. On this board a 24 V input drives the opto, which pulls the 74HC165 pin LOW, so the raw mask is inverted relative to "has signal". The bit assembly only reordered bits; nothing converted the level. The screen showed 分 on every channel no matter what the operator drove in. Polarity now converts once, in the driver, behind IOBOARD_DI_LEVEL_ACTIVE (0 = active low), so callers see 1 = has signal for both inputs and outputs. Verified on the board: page 5 shows YX33 followed immediately by DI_A, crossing the 33-point boundary with no drift; DI_C reads 合 because the operator's signal is on channel C, the other seven read 分; page 6 shows DI_H then all four outputs 释放. Page rows end at y=134, the footer starts at y=144. Input bit order is only partly verified: channel C was confirmed against a real signal, the other seven have not been exercised channel by channel. The board detects the presence of 24 V, not contact closure, and the output rows show the shadow register (our intent) rather than mechanical contact feedback. All three limits are recorded in the page header and in the IOBOARD README. Also adds a polarity guard to the host tests: the input polarity was flipped once already, and until now no assertion would have caught a silent re-flip, since only the DO side was pinned.
This commit is contained in:
@@ -19,7 +19,6 @@
|
||||
#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"
|
||||
@@ -44,34 +43,33 @@ 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 遥信量 */
|
||||
{ 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 录波回放 */
|
||||
{ 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 录波回放 */
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user