diff --git a/source/dev_LaminaAdapter.py b/source/dev_LaminaAdapter.py index 9840d72..859c1e2 100644 --- a/source/dev_LaminaAdapter.py +++ b/source/dev_LaminaAdapter.py @@ -118,58 +118,45 @@ class LaminaAdapter: # 初始化串口通信 if com_name is not None: com_config = {} - if 'baudrate' in kwargs.keys(): - com_config['baudrate'] = kwargs['baudrate'] - if 'parity' in kwargs.keys(): - com_config['parity'] = kwargs['parity'] - if 'bytesize' in kwargs.keys(): - com_config['bytesize'] = kwargs['bytesize'] - if 'stopbits' in kwargs.keys(): - com_config['stopbits'] = kwargs['stopbits'] - self.com = Serial(com_name, **com_config) + com_config['baudrate'] = kwargs['baudrate'] if 'baudrate' in kwargs.keys() else 115200 + com_config['parity'] = kwargs['parity'] if 'parity' in kwargs.keys() else 'N' + com_config['bytesize'] = kwargs['bytesize'] if 'bytesize' in kwargs.keys() else 8 + com_config['stopbits'] = kwargs['stopbits'] if 'stopbits' in kwargs.keys() else 1 + self.__com = Serial(com_name, **com_config) else: - self.com =None + self.__com =None - if 'frame_print' in kwargs.keys(): - self.flag_print = True - - if 'time_out' in kwargs.keys(): - self.time_out = kwargs['time_out'] - if 'retry' in kwargs.keys(): - self.retry = kwargs['retry'] - else: - self.retry = 1 - if 'retry_sub' in kwargs.keys(): - self.retry_sub = kwargs['retry_sub'] - else: - self.retry_sub = 1 - - # 设置645协议地址 - self.addr_645 = addr_645 - # 设置Modbus地址 - self.addr_modbus = addr_modbus + self.flag_print = 'frame_print' in kwargs.keys() + self.time_out = kwargs['time_out'] if 'time_out' in kwargs.keys() else 1 + self.retry = kwargs['retry'] if 'retry' in kwargs.keys() else 1 + self.retry_sub = kwargs['retry_sub'] if 'retry_sub' in kwargs.keys() else 1 self.block = { - 'addr' : self.addr_645, + 'addr' : addr_645, 'type' : 'modbus', 'data' : { - 'addr_dev' : self.addr_modbus, + 'addr_dev' : addr_modbus, 'data_define': modbus_map, }, } - def _transfer_data(self, frame): + def __transfer_data(self, frame): """ 报文数据传输 """ + + if self.__com is None: + print(trans_list_to_str(frame)) + return False + cnt = 0 while cnt < self.retry: - self.com.read_all() - self.com.write(bytearray(frame)) + self.__com.read_all() + self.__com.write(bytearray(frame)) cnt_sub = 0 frame_recv = None while not frame_recv: time.sleep(self.time_out) - frame_recv = self.com.read_all() + frame_recv = self.__com.read_all() cnt_sub += 1 if cnt_sub >= self.retry_sub: break @@ -183,7 +170,7 @@ class LaminaAdapter: print(output_text) break - if hasattr(self, 'flag_print'): + if self.flag_print: print(trans_list_to_str(frame)) print(trans_list_to_str(frame_recv)) @@ -195,12 +182,7 @@ class LaminaAdapter: self.block['data']['data_len'] = dlen frame = make_frame_dlt645(self.block) - ret = False - if self.com is None: - print(trans_list_to_str(frame)) - else: - ret = self._transfer_data(frame) - return ret + return self.__transfer_data(frame) def frame_write_one(self, daddr=0x85, dval=-900): self.block['data']['type'] = 'write_one' @@ -208,12 +190,7 @@ class LaminaAdapter: self.block['data']['data_val'] = dval frame = make_frame_dlt645(self.block) - ret = False - if self.com is None: - print(trans_list_to_str(frame)) - else: - ret = self._transfer_data(frame) - return ret + return self.__transfer_data(frame) def frame_write_dual(self, daddr=0x91, dval=600): self.block['data']['type'] = 'write_dual' @@ -221,12 +198,7 @@ class LaminaAdapter: self.block['data']['data_val'] = dval frame = make_frame_dlt645(self.block) - ret = False - if self.com is None: - print(trans_list_to_str(frame)) - else: - ret = self._transfer_data(frame) - return ret + return self.__transfer_data(frame) def frame_write_str(self, daddr=0x82, dval=[0x06, 0x05, 0x04, 0x03, 0x02, 0x01]): self.block['data']['type'] = 'write_str' @@ -234,12 +206,7 @@ class LaminaAdapter: self.block['data']['data_val'] = dval frame = make_frame_dlt645(self.block) - ret = False - if self.com is None: - print(trans_list_to_str(frame)) - else: - ret = self._transfer_data(frame) - return ret + return self.__transfer_data(frame) def frame_update(self, path_bin): """ 程序升级 @@ -256,11 +223,11 @@ class LaminaAdapter: # 等待擦除完成返回 try_times = 30 - self.com.read_all() + self.__com.read_all() while try_times: time.sleep(self.time_out) - self.com.write(frame_master) - frame_slave = self.com.read_all() + self.__com.write(frame_master) + frame_slave = self.__com.read_all() if not frame_slave: try_times -= 1 continue @@ -282,14 +249,14 @@ class LaminaAdapter: cnt = 0 while cnt < self.retry: - self.com.read_all() - self.com.write(frame_master) + self.__com.read_all() + self.__com.write(frame_master) cnt_sub = 0 frame_slave = None while not frame_slave: time.sleep(self.time_out) - frame_slave = self.com.read_all() + frame_slave = self.__com.read_all() cnt_sub += 1 if cnt_sub >= self.retry_sub: break @@ -316,14 +283,14 @@ class LaminaAdapter: cnt = 0 while cnt < self.retry: - self.com.read_all() - self.com.write(frame_master) + self.__com.read_all() + self.__com.write(frame_master) cnt_sub = 0 frame_slave = None while not frame_slave: time.sleep(self.time_out) - frame_slave = self.com.read_all() + frame_slave = self.__com.read_all() cnt_sub += 1 if cnt_sub >= self.retry_sub: break @@ -342,13 +309,15 @@ class LaminaAdapter: raise Exception("Error, Retry failed.") -def test_communication(): +def test_communication(time_out=2): """ 通信成功率测试 """ log_success = 0 log_failed = 0 log_failedseries = 0 cnt_failedseries = 0 time_start = time.time() + saveconfig_print = dev_lamina.flag_print + dev_lamina.flag_print = False try: while 1: if dev_lamina.frame_read(0x0E, 0x13): @@ -363,13 +332,14 @@ def test_communication(): print(f"Success Frame: {log_success}") print(f"Failed Frame: {log_failed}") print(f"Max Series Failed Frame: {log_failedseries}") - time.sleep(3) + time.sleep(time_out) finally: time_end = time.time() print("Test Result: ") print(f"Time Start: {time.strftime(r'%Y-%m-%d %H:%M:%S', time.localtime(time_start))}, \tTime End: {time.strftime(r'%Y-%m-%d %H:%M:%S', time.localtime(time_end))}") print(f"Time Elapsed: {time_end - time_start}") print(f"Success Rate: {log_success / (log_success + log_failed) * 100}%") + dev_lamina.flag_print = saveconfig_print if __name__=='__main__': mode_config = { @@ -383,7 +353,7 @@ if __name__=='__main__': "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': 3, 'retry_sub': 10}, + 'time_out': 0.5, 'retry': 3, 'retry_sub': 10}, } @@ -400,11 +370,6 @@ if __name__=='__main__': 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) diff --git a/source/func_frame.py b/source/func_frame.py index 967d777..13aa2d5 100644 --- a/source/func_frame.py +++ b/source/func_frame.py @@ -14,7 +14,7 @@ modbus_map = { 0x03: ["Int32示例", 3], 0x04: ["str示例", 4, 16], 0x10: ["addr示例", 5, 6], - 0x20: ["Int32示例", 6], + 0x20: ["Float示例", 6], }