叠光并联适配器:

- 添加报文重发机制;
 - 定义配置执行方案;

source/func_frame.py

@@ -222,40 +222,22 @@ def check_frame_modbus(frame, block=None):
     code_subfunc = frame[2]
     if code_func == 0x07:
         """ 升级回复帧 """
-        if code_subfunc == 0x01 and frame[3] == 0x00:
-            return frame[6] * 256 + frame[7]
+        if frame[3] == 0x00:
+            check_result = True
+        else:
+            check_result = False
+        update_index = frame[4] * 256 + frame[5]
+        check_hope = 0
+        if code_subfunc == 0x01:
+            """ 处理帧头 """
+            check_hope = frame[6] * 256 + frame[7]
         elif code_subfunc == 0x02:
             """ 解析帧序号及返回值, 不做序列号校验 """
-            update_result = frame[3]
-            update_index = frame[4] * 256 + frame[5]
-            # 检查严重错误标志
-            if update_result == 0xFF:
-                raise Exception("Error, Update abort.")
-            if update_result >= 0xA0 or update_result == 0x0F:
-                check_result = False
-            else:
-                check_result = True
-            if update_result >= 0xA0:
-                update_result -= 0x90
-            if update_result >= 0x20:
-                check_hope = update_index + (update_result & 0x0F)
-            elif update_result >= 0x10:
-                check_hope = update_index - (update_result & 0x0F)
-            else:
-                check_hope = None
-            return check_result, update_index, check_hope
         elif code_subfunc == 0x03:
-            if frame[3] == 0xFF:
-                raise Exception("Update verification failed.")
-            elif frame[3] == 0x01:
-                print("Update done.")
-            elif frame[3] == 0x00:
-                print("Update not done.")
-            else:
-                print("Update unknown return value.")
-            return frame[3]
+            """ 升级结束 """
         else:
             raise Exception("Func code or Return code error.")
+        return check_result, update_index, check_hope
     elif code_func == 0x03 or code_func == 0x04:
         """ 数据读取帧 """
         if frame[2] == len(frame[3:-2]):