diff --git a/source/dev_LaminaAdapter.py b/source/dev_LaminaAdapter.py index 31849bf..9840d72 100644 --- a/source/dev_LaminaAdapter.py +++ b/source/dev_LaminaAdapter.py @@ -377,13 +377,13 @@ if __name__=='__main__': # 'addr_645': [0x01, 0x00, 0x00, 0x00, 0x00, 0x40], }, "Debug": {'com_name': 'COM8', 'baudrate': 115200, 'parity': 'N', 'bytesize': 8, 'stopbits': 1, - 'addr_645': [0x01, 0x02, 0x03, 0x04, 0x05, 0x06], - # 'frame_print': True, - 'time_out': 0.1, 'retry': 3, 'retry_sub': 5}, + # 'addr_645': [0x01, 0x02, 0x03, 0x04, 0x05, 0x06], + 'frame_print': True, + 'time_out': 0.1, 'retry': 1, 'retry_sub': 10}, "HPLC": {'com_name': 'COM4', 'baudrate': 9600, 'parity': 'E', 'bytesize': 8, 'stopbits': 1, - 'addr_645': [0x01, 0x02, 0x03, 0x04, 0x05, 0x06], - # 'frame_print': True, - 'time_out': 1, 'retry': 1, 'retry_sub': 10}, + # 'addr_645': [0x01, 0x02, 0x03, 0x04, 0x05, 0x06], + 'frame_print': True, + 'time_out': 1, 'retry': 3, 'retry_sub': 10}, } @@ -391,26 +391,96 @@ if __name__=='__main__': dev_lamina.frame_read(0x0100, 0x20) + if 0: + dev_lamina.frame_write_str(0x82, [0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA]) + dev_lamina.frame_write_str(0x82, [0x00, 0x00, 0x00, 0x00, 0x00, 0x00]) + dev_lamina.frame_write_str(0x82, [0x0A, 0x00, 0x00, 0x00, 0x00, 0x00]) + dev_lamina.frame_write_str(0x82, [0xFF, 0x00, 0x00, 0x00, 0x00, 0x00]) + dev_lamina.frame_write_str(0x82, [0xA1, 0x00, 0x00, 0x00, 0x00, 0x00]) + dev_lamina.frame_write_str(0x82, [0x1A, 0x00, 0x00, 0x00, 0x00, 0x00]) + dev_lamina.frame_write_str(0x82, [0x99, 0x99, 0x99, 0x99, 0x99, 0x99]) + dev_lamina.frame_write_str(0x82, [0x00, 0x00, 0x00, 0x00, 0x00, 0x01]) + + if 0: + while 1: + dev_lamina.frame_read(0x0E, 0x13) + time.sleep(2) + if 0: + dev_lamina.frame_write_one(0x52, 0x01) + time.sleep(0.5) + dev_lamina.frame_write_one(0x50, 0x00) + if 0: + while 1: + code_mes = input("扫描数据") + temp = code_mes[5:7] + code_mes[-10:] + code_addr = [int(temp[i:i+2], 16) for i in range(0, len(temp), 2)] + print(f"扫描结果: {code_mes}") + print(f"载波地址: {trans_list_to_str(code_addr)}") + dev_lamina.frame_read(0x100, 0x20) + time.sleep(0.5) + dev_lamina.frame_write_str(0x0180, list(code_mes)) + time.sleep(0.5) + dev_lamina.frame_read(0x180, 0x10) + time.sleep(0.5) + dev_lamina.frame_write_str(0x82, code_addr) + time.sleep(0.5) + dev_lamina.frame_read(0x80, 0x08) + time.sleep(0.5) + dev_lamina.frame_write_one(0xA3, 0x01) + time.sleep(0.5) + dev_lamina.frame_write_one(0x51, 0x01) + time.sleep(5) + dev_lamina.frame_read(0x0E, 0x13) + time.sleep(5) + dev_lamina.frame_read(0x0E, 0x13) + time.sleep(0.5) + dev_lamina.frame_write_one(0x50, 0x00) + + if 0: + dev_lamina.frame_write_one(0x0054, 0x01) + dev_lamina.frame_read(0x000E, 0x02) + dev_lamina.frame_write_one(0x0054, 0x03) + dev_lamina.frame_read(0x000E, 0x02) + dev_lamina.frame_write_one(0x0054, 0x07) + dev_lamina.frame_read(0x000E, 0x02) + dev_lamina.frame_write_one(0x0054, 0x06) + dev_lamina.frame_read(0x000E, 0x02) + dev_lamina.frame_write_one(0x0054, 0x04) + dev_lamina.frame_read(0x000E, 0x02) + dev_lamina.frame_write_one(0x0054, 0x00) + dev_lamina.frame_read(0x000E, 0x02) if 0: dev_lamina.frame_read(0x0E, 0x14) if 0: dev_lamina.frame_read(0x60, 0x60) - if 0: - dev_lamina.frame_write_str(0x0130, list("SN20240107546")) - dev_lamina.frame_write_str(0x0140, list("MES20240107546")) - dev_lamina.frame_write_str(0x0150, list("D2024050101030")) + dev_lamina.frame_read(0x70, 0x02) + dev_lamina.frame_write_one(0x70, 2100) + dev_lamina.frame_write_one(0x71, 2200) + dev_lamina.frame_read(0x70, 0x02) + dev_lamina.frame_write_one(0x70, 2300) + dev_lamina.frame_write_one(0x71, 2100) + dev_lamina.frame_read(0x70, 0x02) + if 0: + dev_lamina.frame_write_str(0x0170, list("SN202405201117-1")) + dev_lamina.frame_write_str(0x0180, list("MES202405201117-2")) + dev_lamina.frame_write_str(0x0190, list("D202405211500-3")) time.sleep(2) - dev_lamina.frame_read(0x0130, 0x30) + dev_lamina.frame_read(0x0170, 0x30) if not hasattr(__builtins__,"__IPYTHON__"): - path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\lamina_adapter.bin") + path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\SLCP001_240604_1200_V1.01a.bin") # path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\SLCP001_240520_0000_T1.11.bin") - # path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\SLCP001_240525_1230_V1.15.bin") + # 生产镜像版本 + # path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\SLCP001_240525_1800_V1.12.bin") + # 江苏发货产品灌装版本 + # path_bin = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\upgrade\SLCP001_240603_2100_V1.18.bin") dev_lamina.frame_update(path_bin) time.sleep(6) dev_lamina.frame_read(0x0100, 0x20) + dev_lamina.frame_write_one(0x52, 0x01) + diff --git a/source/utl_upgrade.py b/source/utl_upgrade.py index c8ddcc9..0f16ed5 100644 --- a/source/utl_upgrade.py +++ b/source/utl_upgrade.py @@ -403,35 +403,37 @@ if __name__ == "__main__": back_header1 = bin_back.read_bytes()[:184] back_data_e1 = bin_back.read_bytes()[184:] - root = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\uart_tool") - result = Path(r'D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\uart_tool\生产版本3') + root = Path(r"D:\WorkingProject\LightStackAdapter\software\lamina_adapter\tools\uart_tool\生产版本9") + result = root # 正常启动镜像 - file_image = result / 'SLCP001_240528_1741_ROM.bin' + hex_boot = root / r"bootloader.hex" + hex_main = root / r"SLCP001_240614_2210_V1.03.hex" + hex_back = root / r"SLCP001_240614_2210_B1.03.hex" + + file_image = result / f'{hex_main.stem[:-6]}_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_240528_1741_ROM_b1.bin' + file_image1 = result / f'{file_image.stem}_b1.bin' data_image = data_bins[0].copy() data_image[0x0FC018: 0x0FC01A] = [0x00, 0x01] - file_image.write_bytes(data_image) + file_image1.write_bytes(data_image) # 异常镜像-备份分区md5错误 - file_image = result / 'SLCP001_240528_1741_ROM_b2.bin' + file_image2 = result / f'{file_image.stem}_b2.bin' data_image = data_bins[0].copy() data_image[0x0FE018: 0x0FE01A] = [0x00, 0x01] - file_image.write_bytes(data_image) + file_image2.write_bytes(data_image) # 异常镜像-双分区md5错误 - file_image = result / 'SLCP001_240528_1741_ROM_b3.bin' + file_image3 = result / f'{file_image.stem}_b3.bin' data_image = data_bins[0].copy() data_image[0x0FC018: 0x0FC01A] = [0x00, 0x01] data_image[0x0FE018: 0x0FE01A] = [0x00, 0x01] - file_image.write_bytes(data_image) + file_image3.write_bytes(data_image)