修改报文生成与解析调用为保护函数;
This commit is contained in:
@@ -22,11 +22,11 @@ class DeviceSerial:
|
|||||||
|
|
||||||
match callbacks:
|
match callbacks:
|
||||||
case (maker, parser):
|
case (maker, parser):
|
||||||
self.frame_maker = maker if maker is not None else lambda self: ''
|
self._frame_maker = maker if maker is not None else lambda self: ''
|
||||||
self.frame_parser = parser if parser is not None else lambda self, frame: ''
|
self._frame_parser = parser if parser is not None else lambda self, frame: ''
|
||||||
case _:
|
case _:
|
||||||
self.farme_maker = lambda self: ''
|
self._frame_maker = lambda self: ''
|
||||||
self.frame_parser = lambda self, frame: ''
|
self._frame_parser = lambda self, frame: ''
|
||||||
|
|
||||||
self.output = {
|
self.output = {
|
||||||
'result': False,
|
'result': False,
|
||||||
@@ -56,7 +56,7 @@ class DeviceSerial:
|
|||||||
flag_frame = True
|
flag_frame = True
|
||||||
frame_recv += bytes_read
|
frame_recv += bytes_read
|
||||||
try:
|
try:
|
||||||
self.output = self.frame_parser(frame_recv)
|
self.output = self._frame_parser(frame_recv)
|
||||||
if self.flag_print:
|
if self.flag_print:
|
||||||
print("Read Frame: ", ByteConv.trans_list_to_str(frame_recv))
|
print("Read Frame: ", ByteConv.trans_list_to_str(frame_recv))
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
@@ -70,7 +70,7 @@ class DeviceSerial:
|
|||||||
def _transfer_data(self) -> bool:
|
def _transfer_data(self) -> bool:
|
||||||
""" 串口收发报文, 包含重试逻辑与数据打印 """
|
""" 串口收发报文, 包含重试逻辑与数据打印 """
|
||||||
# 生成发送帧
|
# 生成发送帧
|
||||||
frame: bytearray = self.frame_maker()
|
frame: bytearray = self._frame_maker()
|
||||||
|
|
||||||
if self.__com is None:
|
if self.__com is None:
|
||||||
""" 无效通信接口, 打印报文后返回 """
|
""" 无效通信接口, 打印报文后返回 """
|
||||||
|
|||||||
Reference in New Issue
Block a user