修复raise语句用法;

添加float数据解析;
更新升级传输方案;
This commit is contained in:
何 泽隆
2024-05-21 20:20:23 +08:00
parent 2582721652
commit 5cf4246338
4 changed files with 80 additions and 37 deletions

View File

@@ -58,12 +58,12 @@ class EnergyRouter:
self.tcp_socket.send(frame_master)
frame_slave = self.tcp_socket.recv(32)
if frame_slave == '':
raise("TCP closed.")
raise Exception("TCP closed.")
self.block['file_block_size'] = check_frame_modbus(frame_slave, self.block)
if self.block['file_block_size'] == 0:
raise("Error slave response.")
raise Exception("Error slave response.")
# 避免接收到延迟返回报文
time.sleep(0.4)
@@ -96,10 +96,10 @@ class EnergyRouter:
seq_frame_slave[i] = self.tcp_socket.recv(8)
# 接收到空数据, 对端已关闭连接
if seq_frame_slave[i] == '':
raise("TCP closed.")
raise Exception("TCP closed.")
result, seq_current, seq_hope = check_frame_modbus(seq_frame_slave[i], None)
if seq_current < seq_offset:
raise("Error.")
raise Exception("Error.")
elif result:
seq_window[seq_current - seq_offset] = 2
data_remain -= self.block['file_block_size']
@@ -129,7 +129,7 @@ class EnergyRouter:
self.tcp_socket.send(frame_master)
frame_slave = self.tcp_socket.recv(8)
if frame_slave == '':
raise("TCP closed.")
raise Exception("TCP closed.")
ret = check_frame_modbus(frame_slave[:18], self.block)