新版绝缘模块

DcPillar/Src/Drivers/Drv_ImdJyc.c

@@ -211,7 +211,7 @@ int ImdReadRecv(u8 *pRespBuff, u16 MaxRespLen, u32 TimeOut)
         RecvCnt++;
         if(RecvCnt >= MaxRespLen)
         {
-          if((ImdRtuAddr == pRespBuff[0]) && (0x03 == pRespBuff[1])
+          if((ImdRtuAddr == pRespBuff[0]) && ((0x03 == pRespBuff[1])||(0x10 == pRespBuff[1]))
                 && ((MaxRespLen - 5) == pRespBuff[2]) && (0 == (pRespBuff[2] & 0x01)))
           {
             CheckSum = ImdCrc16(pRespBuff, MaxRespLen-2);
@@ -230,6 +230,7 @@ int ImdReadRecv(u8 *pRespBuff, u16 MaxRespLen, u32 TimeOut)
   return -4;
 }
 
+
 void ImdSendCmd(u8 *pData, u16 Len)
 {
   ImdSendEnable();
@@ -279,6 +280,14 @@ int ImdRead(StructImdValue *pImdValue)
     pImdValue->NegatResist = (Buff[13]<<8) | Buff[14];
     pImdValue->PositWarn = Buff[16];
     pImdValue->NegatWarn = Buff[18];
+	pImdValue->SofVer = (Buff[3]<<8) | Buff[4];
+	if(pImdValue->SofVer>=0x0020)
+	{
+		if(0 == ImdReadRecv(Buff, 7, ImdAckTimeOut))
+  		{
+			pImdValue->Volt = (Buff[3]<<8) | Buff[4];
+		}
+	}
     osMutexRelease(ImdMutex);
     return 0;
   }
@@ -470,6 +479,14 @@ int ImdRead_B(StructImdValue *pImdValue)
     pImdValue->NegatResist = (Buff[13]<<8) | Buff[14];
     pImdValue->PositWarn = Buff[16];
     pImdValue->NegatWarn = Buff[18];
+	pImdValue->SofVer = (Buff[3]<<8) | Buff[4];
+	if(pImdValue->SofVer>=0x0020)
+	{
+		if(0 == ImdReadRecv(Buff, 7, ImdAckTimeOut))
+  		{
+			pImdValue->Volt = (Buff[3]<<8) | Buff[4];
+		}
+	}
     osMutexRelease(ImdMutex);
     return 0;
   }

DcPillar/Src/Drivers/Drv_ImdJyc.h

@@ -43,6 +43,8 @@ typedef struct
   u16 PnVolt;
   u16 PositResist;
   u16 NegatResist;
+  u16 SofVer;
+  u16 Volt;
 }StructImdValue;
 
 extern StructImdValue ImdValue;

DcPillar/Src/SmartAllocation/Drv_SmartAllocation.c

@@ -342,7 +342,7 @@ void DcModuleCtrlProcess_SmartAllocation(void)
 				Temp++;
 		}
 		else 
-			Temp = DcModuleManage.SetCurrt;
+			Temp = DcModuleManage.SetCurrt/2;
 		
 		if (Temp > (DcModuleAbility.MaxCurrt * 100))
 			Temp = (DcModuleAbility.MaxCurrt * 100);
@@ -403,7 +403,7 @@ void DcModuleCtrlProcess_SmartAllocation(void)
 				Temp++;
 		}
 		else 
-			Temp = DcModuleManage_B.SetCurrt;
+			Temp = DcModuleManage_B.SetCurrt/2;
 
 		if (Temp > (DcModuleAbility.MaxCurrt * 100))
 			Temp = (DcModuleAbility.MaxCurrt * 100);