From 85aa6da4dc3ff4c56bd0778e4d2a27fe015332bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=20=E6=B3=BD=E9=9A=86?= Date: Thu, 30 May 2024 11:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E5=88=B6=E4=BD=9C=E6=B5=81=E7=A8=8B;=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E9=A1=B9=E5=9C=B0=E5=9D=80=E5=88=86?= =?UTF-8?q?=E5=B8=83;=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E8=AF=BB?= =?UTF-8?q?=E5=86=99=E9=87=8D=E5=8F=91=E9=80=BB=E8=BE=91;=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=95=B0=E6=8D=AE=E5=AF=B9?= =?UTF-8?q?`0xFF`=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/dev_LaminaAdapter.py | 19 +++++++++++-------- source/func_frame.py | 1 + source/utl_upgrade.py | 20 ++++++++++++-------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/source/dev_LaminaAdapter.py b/source/dev_LaminaAdapter.py index 0e3a56b..dd6311b 100644 --- a/source/dev_LaminaAdapter.py +++ b/source/dev_LaminaAdapter.py @@ -101,12 +101,15 @@ modbus_map = { 0xAF: ["保留", 1], 0x100: ["版本", 4, 16], 0x110: ["型号", 4, 16], - 0x120: ["硬件", 4, 16], - 0x130: ["SN", 4, 16], - 0x140: ["MES", 4, 16], - 0x150: ["Datetime", 4, 16], - 0x160: ["载波芯片地址", 4, 16], - 0x170: ["厂商", 4, 16], + 0x120: ["载波芯片地址", 4, 16], + 0x130: ["厂商", 4, 8], + 0x138: ["保留", 4, 8], + 0x140: ["保留", 4, 16], + 0x150: ["保留", 4, 16], + 0x160: ["硬件", 4, 16], + 0x170: ["SN", 4, 16], + 0x180: ["MES", 4, 16], + 0x190: ["Datetime", 4, 16], } @@ -173,14 +176,14 @@ class LaminaAdapter: try: output_text = check_frame_dlt645(frame_recv, block=self.block) - cnt += 1 except Exception as e: print(e) + cnt += 1 continue print(output_text) break - if hasattr(self, 'frame_print'): + if hasattr(self, 'flag_print'): print(trans_list_to_str(frame)) print(trans_list_to_str(frame_recv)) diff --git a/source/func_frame.py b/source/func_frame.py index 04f0ce2..967d777 100644 --- a/source/func_frame.py +++ b/source/func_frame.py @@ -188,6 +188,7 @@ def display_data(modbus_map: dict, address: int, data: list): """ 字符串表示 """ data_len = current_map[2] item = display_str(data, data_len) + item = item.replace(b'\xff', b' 0xFF') item = item.decode() elif current_map[1] == 5: """ 载波地址表示 """ diff --git a/source/utl_upgrade.py b/source/utl_upgrade.py index 7a581b6..c8ddcc9 100644 --- a/source/utl_upgrade.py +++ b/source/utl_upgrade.py @@ -404,29 +404,33 @@ if __name__ == "__main__": back_data_e1 = bin_back.read_bytes()[184:] root = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\uart_tool") - result = Path('result') + result = Path(r'D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\uart_tool\生产版本3') # 正常启动镜像 - file_image = result / 'SLCP001_MEM.bin' - hex_boot = root / r"生产版本\bootloader.hex" - hex_main = root / r"生产版本\SLCP001_240525_1800_V1.12.hex" - hex_back = root / r"生产版本\SLCP001_240525_1800_B1.12.hex" + file_image = result / 'SLCP001_240528_1741_ROM.bin' + file_main_header = result / 'SLCP001_header_main.bin' + file_back_header = result / 'SLCP001_header_back.bin' + hex_boot = root / r"生产版本3\bootloader.hex" + hex_main = root / r"生产版本3\SLCP001_240528_1741_V1.01.hex" + hex_back = root / r"生产版本3\SLCP001_240528_1741_B1.01.hex" data_bins = test4(hex_boot, hex_main, hex_back) file_image.write_bytes(data_bins[0].copy()) + file_main_header.write_bytes(data_bins[1].copy()) + file_back_header.write_bytes(data_bins[4].copy()) # 异常镜像-主分区md5错误 - file_image = result / 'SLCP001_MEM_b1.bin' + file_image = result / 'SLCP001_240528_1741_ROM_b1.bin' data_image = data_bins[0].copy() data_image[0x0FC018: 0x0FC01A] = [0x00, 0x01] file_image.write_bytes(data_image) # 异常镜像-备份分区md5错误 - file_image = result / 'SLCP001_MEM_b2.bin' + file_image = result / 'SLCP001_240528_1741_ROM_b2.bin' data_image = data_bins[0].copy() data_image[0x0FE018: 0x0FE01A] = [0x00, 0x01] file_image.write_bytes(data_image) # 异常镜像-双分区md5错误 - file_image = result / 'SLCP001_MEM_b3.bin' + file_image = result / 'SLCP001_240528_1741_ROM_b3.bin' data_image = data_bins[0].copy() data_image[0x0FC018: 0x0FC01A] = [0x00, 0x01] data_image[0x0FE018: 0x0FE01A] = [0x00, 0x01]