每日更新;

source/dev_EnergyRouter.py

@@ -5,6 +5,8 @@ from utl import trans_list_to_str
 from func_frame import make_frame_modbus, check_frame_modbus
 
 modbus_map = {
+    0x00: ['编译日期', 4, 6],
+    0x06: ['编译时间', 4, 5],
 }
 
 class EnergyRouter:
@@ -16,14 +18,16 @@ class EnergyRouter:
         self.tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.tcp_socket.connect((self._ip, self._port))
 
-    def frame_read(self, daddr=0x00, dlen=0x10):
-        block_modbus = {
+        self.block = {
             'addr_dev' : self._addr_modbus,
-            'data_addr' : daddr,
-            'data_len' : dlen,
-            'type' : 'read',
+            'data_define': modbus_map,    
         }
-        frame = make_frame_modbus(block_modbus)
+
+    def frame_read(self, daddr=0x00, dlen=0x10):
+        self.block['type'] = 'read'
+        self.block['data_addr'] = daddr
+        self.block['data_len'] = dlen
+        frame = make_frame_modbus(self.block)
 
         if self.tcp_socket is None:
             print(trans_list_to_str(frame))
@@ -33,7 +37,7 @@ class EnergyRouter:
         self.tcp_socket.send(bytearray(frame))
         time.sleep(0.5)
         frame_recv = self.tcp_socket.recv(128)
-        output_text = check_frame_modbus(frame_recv, block_modbus)
+        output_text = check_frame_modbus(frame_recv, self.block)
         print(output_text)
 
 
@@ -41,65 +45,72 @@ class EnergyRouter:
         """ 程序升级
 
         """
-        block_modbus = {
-            'addr_dev' : self.addr_modbus,
-            'type' : 'update',
-            'step' : 'start',
-            'index' : 0,
-            'file' : Path(path_bin).read_bytes(),
-            'header_offset': 128,
-        }
+        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(block_modbus))
+        frame_master = bytearray(make_frame_modbus(self.block))
 
         # 等待擦除完成返回
-        try_times = 3000
-        self.tcp_socket.recv()
-        while try_times:
-            time.sleep(0.4)
-            self.tcp_socket.send(frame_master)
-            frame_slave = self.tcp_socket.recv()
-            if not frame_slave:
-                try_times -= 1
-                continue
-            
-            block_modbus['file_block_size'] = check_frame_modbus(frame_slave, block_modbus)
-            break
+        time.sleep(0.4)
+        self.tcp_socket.send(frame_master)
+        frame_slave = self.tcp_socket.recv(32)
+        if frame_slave == '':
+            raise("TCP closed.")
+        
+        self.block['file_block_size'] = check_frame_modbus(frame_slave, self.block)
 
-        if block_modbus['file_block_size'] == 0:
+        if self.block['file_block_size'] == 0:
             raise("Error slave response.")
 
         # 避免接收到延迟返回报文
         time.sleep(0.4)
 
         # 文件传输
-        block_modbus['step'] = 'trans'
-        data_remain = len(block_modbus['file']) - block_modbus['header_offset']
+        self.block['index'] = 0
+        self.block['step'] = 'trans'
+        data_remain = len(self.block['file']) - self.block['header_offset']
+        seq_offset = 0
+        seq_window = [0, 0, 0, 0]
+        seq_frame_master = [None, None, None, None]
+        seq_frame_slave  = [None, None, None, None]
         while data_remain > 0:
-            frame_master = bytearray(make_frame_modbus(block_modbus))
+            # 更新并发送帧
+            for i, s in enumerate(seq_window):
+                if s == 0:
+                    self.block['index'] = seq_offset + i
+                    seq_frame_master[i] = bytearray(make_frame_modbus(self.block))
+                    self.tcp_socket.send(seq_frame_master[i])
+            # 接收帧回复
+            for i in range(len(seq_frame_master)):
+                seq_frame_slave[i] = self.tcp_socket.recv(8)
+                # 接收到空数据, 对端已关闭连接
+                if seq_frame_slave[i] == '':
+                    raise("TCP closed.")
+                result, seq_current, seq_hope = check_frame_modbus(seq_frame_slave[i], self.block)
+                if result:
+                    seq_window[seq_current - seq_offset] = 1
+                    data_remain -= self.block['file_block_size']
 
-            self.tcp_socket.recv()
-            self.tcp_socket.send(frame_master)
-            time.sleep(0.2)
-            frame_slave = None
-            while not frame_slave:
-                frame_slave = self.tcp_socket.recv()
-            check_frame_modbus(frame_slave, block_modbus)
+            # 移动发送窗口
+            while seq_window[0]:
+                seq_window[0] = seq_window[1]
+                seq_window[1] = seq_window[2]
+                seq_window[2] = seq_window[3]
+                seq_window[3] = 0
+                seq_offset += 1
             
-            block_modbus['index'] += 1
-            data_remain -= block_modbus['file_block_size']
-
         # 结束升级
-        block_modbus['step'] = 'end'
-        frame_master = bytearray(make_frame_modbus(block_modbus))
+        self.block['step'] = 'end'
+        frame_master = bytearray(make_frame_modbus(self.block))
 
-        self.tcp_socket.recv()
         self.tcp_socket.send(frame_master)
-        time.sleep(0.1)
-        frame_slave = None
-        while not frame_slave:
-            frame_slave = self.tcp_socket.recv()
-        check_frame_modbus(frame_slave[:18], block_modbus)
+        # time.sleep(0.1)
+        frame_slave = self.tcp_socket.recv(8)
+        if frame_slave == '':
+            raise("TCP closed.")
+        check_frame_modbus(frame_slave[:18], self.block)
 
 
 if __name__ == "__main__":
@@ -112,6 +123,6 @@ if __name__ == "__main__":
 
     dev_ep.frame_update(path_file)
 
-
+    pass