linghtiin/DebugTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

积累修改;

Browse Source
This commit is contained in:
何 泽隆
2025-01-04 21:20:27 +08:00
parent 00ddd6d68c
commit 5022bf802e
3 changed files with 251 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/device/function/protocols.py
View File

@@ -429,14 +429,20 @@ def display_data(address: int, data: bytes, modbus_map: dict=modbus_map) -> dict
def print_display(output_data: dict):
""" 格式化表示输出数据 """
bank_chars = ' \t\000'
print("Parse Result:")
label_len_max = max(map(lambda x: len(x[0]), output_data.values()))
data_len_max = max(map(lambda x: len(str(x[1])), output_data.values()))
for key, value in output_data.items():
label = value[0]
data = "-".join(map(str, value[1])) if type(value) == list else value[1]
print(f"{tools.ByteConv.display_hex(key, 4)}: {data:<{data_len_max}} {label:<{label_len_max}}")
match value:
case (str() as label, list() as data):
print(f"{tools.ByteConv.display_hex(key, 4)}: {'-'.join(map(str, data)):<{data_len_max}} {label:<{label_len_max}}")
case (str() as label, str() as data):
print(f"{tools.ByteConv.display_hex(key, 4)}: {data.rstrip(bank_chars):<{data_len_max}} {label:<{label_len_max}}")
case (str() as label, data):
print(f"{tools.ByteConv.display_hex(key, 4)}: {data:<{data_len_max}} {label:<{label_len_max}}")
case _:
raise ValueError(f"Key: {key}, Unkown Value: {value}")