修改了次级配电协议,优化消息结构

test/disSysTest/udpMsg.py

@@ -366,7 +366,7 @@ class msg_disLowBusFbMsg:
         self.start1 = 0x40
         self.start2 = 0x40
         self.id = 0x0008
-        self.length = 24  # disLowBusState结构体大小
+        self.length = 25  # disLowBusState结构体大小
         self.checkCode = 0x00
         
         # disLowBusState成员
@@ -378,7 +378,8 @@ class msg_disLowBusFbMsg:
         self.reservedCircuitBreaker1 = 0x00
         self.reservedCircuitBreaker2 = 0x00
         self.emergencyLithiumBatteryGroup1CircuitBreaker = 0x00
-        self.powerFailureSignal = 0x00
+        self.instrumentPowerFailureSignal = 0x00
+        self.emergencyPowerFailureSignal = 0x00
         self.waterIngressionAlarm = 0x00
         self.instrumentBusbarVoltage = 0
         self.instrumentBusbarCurrent = 0
@@ -406,7 +407,8 @@ class msg_disLowBusFbMsg:
         data += struct.pack('<B', self.reservedCircuitBreaker1)
         data += struct.pack('<B', self.reservedCircuitBreaker2)
         data += struct.pack('<B', self.emergencyLithiumBatteryGroup1CircuitBreaker)
-        data += struct.pack('<B', self.powerFailureSignal)
+        data += struct.pack('<B', self.instrumentPowerFailureSignal)
+        data += struct.pack('<B', self.emergencyPowerFailureSignal)
         data += struct.pack('<B', self.waterIngressionAlarm)
         data += struct.pack('<H', self.instrumentBusbarVoltage)
         data += struct.pack('<H', self.instrumentBusbarCurrent)
@@ -426,8 +428,8 @@ class msg_disLowBusFbMsg:
         return data
 
     def unpack(self, data):
-        if len(data) < 4 + self.length + 1:  # 头部4字节+数据长度+校验码1字节
-            return False
+        # if len(data) < 4 + self.length + 1:  # 头部4字节+数据长度+校验码1字节
+        #     return False
             
         self.start1 = data[0]
         self.start2 = data[1]
@@ -443,7 +445,9 @@ class msg_disLowBusFbMsg:
         self.reservedCircuitBreaker1 = data[offset]; offset +=1
         self.reservedCircuitBreaker2 = data[offset]; offset +=1
         self.emergencyLithiumBatteryGroup1CircuitBreaker = data[offset]; offset +=1
-        self.powerFailureSignal = data[offset]; offset +=1
+        # self.powerFailureSignal = data[offset]; offset +=1
+        self.instrumentPowerFailureSignal = data[offset]; offset +=1
+        self.emergencyPowerFailureSignal = data[offset]; offset +=1
         self.waterIngressionAlarm = data[offset]; offset +=1
         self.instrumentBusbarVoltage = struct.unpack_from('<H', data, offset)[0]; offset +=2
         self.instrumentBusbarCurrent = struct.unpack_from('<H', data, offset)[0]; offset +=2