替换旧版帧处理函数;
This commit is contained in:
@@ -3,7 +3,7 @@ import socket
|
||||
import random
|
||||
from pathlib import Path
|
||||
from tools.ByteConv import trans_list_to_str
|
||||
from func_frame import make_frame_modbus, check_frame_modbus
|
||||
from source.func_frame import make_frame_modbus, check_frame_modbus, print_display
|
||||
|
||||
modbus_map = {
|
||||
0x00: ['编译日期', 4, 6],
|
||||
@@ -11,18 +11,59 @@ modbus_map = {
|
||||
}
|
||||
|
||||
class EnergyRouter:
|
||||
def __init__(self, ip="192.168.100.10", port=7, adddr_modbus=0x01):
|
||||
""" 能量路由器远程升级测试(未完成)
|
||||
"""
|
||||
def __init__(self, ip="192.168.100.10", port=7, adddr_modbus=0x01, **kwargs):
|
||||
self._ip = ip
|
||||
self._port = port
|
||||
self._addr_modbus =adddr_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.tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.tcp_socket.connect((self._ip, self._port))
|
||||
|
||||
self.block = {
|
||||
'addr_dev' : self._addr_modbus,
|
||||
'addr_dev' : adddr_modbus,
|
||||
'data_define': modbus_map,
|
||||
}
|
||||
self.output = {
|
||||
'result': False,
|
||||
'code_func': 0x00,
|
||||
}
|
||||
self.log = {
|
||||
'send': 0,
|
||||
'read': 0,
|
||||
'keep-fail': 0,
|
||||
'record': {
|
||||
'config': None,
|
||||
'data': None,
|
||||
},
|
||||
}
|
||||
|
||||
def __transfer_data(self, frame: bytes) -> bool:
|
||||
""" 数据传输处理函数 """
|
||||
if self.tcp_socket is None:
|
||||
print(trans_list_to_str(frame))
|
||||
return False
|
||||
|
||||
try:
|
||||
self.tcp_socket.send(frame)
|
||||
time.sleep(self.time_out)
|
||||
frame_recv = self.tcp_socket.recv(128)
|
||||
|
||||
self.output = check_frame_modbus(frame_recv, self.block)
|
||||
if self.flag_print:
|
||||
print("Read Frame: ", trans_list_to_str(frame_recv))
|
||||
if 'Regs' in self.output.keys():
|
||||
print_display(self.output['Regs'])
|
||||
except Exception as ex:
|
||||
print("Error Info: ", ex)
|
||||
if self.flag_print and frame_recv:
|
||||
print("Fail Data: " , trans_list_to_str(frame_recv))
|
||||
self.output['result'] = False
|
||||
|
||||
return self.output['result']
|
||||
|
||||
def frame_read(self, daddr=0x00, dlen=0x10):
|
||||
self.block['type'] = 'read'
|
||||
@@ -30,40 +71,26 @@ class EnergyRouter:
|
||||
self.block['data_len'] = dlen
|
||||
frame = make_frame_modbus(self.block)
|
||||
|
||||
if self.tcp_socket is None:
|
||||
print(trans_list_to_str(frame))
|
||||
return
|
||||
|
||||
# self.tcp_socket.recv(8)
|
||||
self.tcp_socket.send(bytearray(frame))
|
||||
time.sleep(0.5)
|
||||
frame_recv = self.tcp_socket.recv(128)
|
||||
output_text = check_frame_modbus(frame_recv, self.block)
|
||||
print(output_text)
|
||||
|
||||
return self.__transfer_data(frame)
|
||||
|
||||
def frame_update(self, path_bin):
|
||||
""" 程序升级
|
||||
|
||||
"""
|
||||
param_saved = self.flag_print, self.retry, self.time_out
|
||||
|
||||
self.block['type'] = 'update'
|
||||
self.block['step'] = 'start'
|
||||
self.block['file'] = Path(path_bin).read_bytes()
|
||||
self.block['header_offset'] = 128
|
||||
# 启动帧
|
||||
frame_master = bytearray(make_frame_modbus(self.block))
|
||||
frame_master = make_frame_modbus(self.block)
|
||||
|
||||
# 等待擦除完成返回
|
||||
time.sleep(0.4)
|
||||
self.tcp_socket.send(frame_master)
|
||||
frame_slave = self.tcp_socket.recv(32)
|
||||
if frame_slave == '':
|
||||
raise Exception("TCP closed.")
|
||||
|
||||
self.block['file_block_size'] = check_frame_modbus(frame_slave, self.block)
|
||||
|
||||
if self.block['file_block_size'] == 0:
|
||||
raise Exception("Error slave response.")
|
||||
if not self.__transfer_data(frame_master):
|
||||
self.flag_print, self.retry, self.time_out = param_saved
|
||||
print('Upgrade Fail: start')
|
||||
return False
|
||||
self.block['file_block_size'] = self.output['upgrade']['length']
|
||||
|
||||
# 避免接收到延迟返回报文
|
||||
time.sleep(0.4)
|
||||
@@ -87,7 +114,7 @@ class EnergyRouter:
|
||||
continue
|
||||
seq_window[i] = 1
|
||||
self.block['index'] = seq_offset + i
|
||||
seq_frame_master[i] = bytearray(make_frame_modbus(self.block))
|
||||
seq_frame_master[i] = make_frame_modbus(self.block)
|
||||
self.tcp_socket.send(seq_frame_master[i])
|
||||
# 接收帧回复
|
||||
tmp = list(zip(range(len(seq_window)), seq_window))
|
||||
@@ -97,10 +124,11 @@ class EnergyRouter:
|
||||
# 接收到空数据, 对端已关闭连接
|
||||
if seq_frame_slave[i] == '':
|
||||
raise Exception("TCP closed.")
|
||||
result, seq_current, seq_hope = check_frame_modbus(seq_frame_slave[i], None)
|
||||
self.output = check_frame_modbus(seq_frame_slave[i], None)
|
||||
seq_current, seq_hope = self.output['upgrade']['index'], self.output['upgrade']['hope']
|
||||
if seq_current < seq_offset:
|
||||
raise Exception("Error.")
|
||||
elif result:
|
||||
elif self.output['result']:
|
||||
seq_window[seq_current - seq_offset] = 2
|
||||
data_remain -= self.block['file_block_size']
|
||||
if seq_hope is not None and seq_hope < seq_offset:
|
||||
@@ -121,16 +149,15 @@ class EnergyRouter:
|
||||
seq_window[i] = 0
|
||||
|
||||
# 结束升级
|
||||
ret = 0
|
||||
self.block['step'] = 'end'
|
||||
frame_master = bytearray(make_frame_modbus(self.block))
|
||||
frame_master = make_frame_modbus(self.block)
|
||||
|
||||
while ret == 0:
|
||||
while self.output['result'] is False:
|
||||
self.tcp_socket.send(frame_master)
|
||||
frame_slave = self.tcp_socket.recv(8)
|
||||
if frame_slave == '':
|
||||
raise Exception("TCP closed.")
|
||||
ret = check_frame_modbus(frame_slave[:18], self.block)
|
||||
self.output = check_frame_modbus(frame_slave[:18], self.block)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user