修复错误

B枪CC检测;灯运行状态,等等

DcPillar/Src/Drivers/Drv_TCUComm.c

@@ -740,7 +740,7 @@ u8 AllowDTUStartCharge_B(u8 * Reason)
 		*Reason = 0x06;
 	else if (ChargePauseFlag_B == 1)
 		*Reason = 0x07;
-	else if (eSwSta_On != CcStatusRead())
+	else if (eSwSta_On != CcStatusRead_B())
 		*Reason = 0x08;
 	else if (PillarError_B.Value.Emergency == 1)
 		*Reason = 0x09;

DcPillar/Src/SmartAllocation/Drv_SmartAllocation.c

@@ -355,7 +355,7 @@ void DcModuleCtrlProcess_SmartAllocation(void)
 			{
 				if (i != 2) //升压
 				{
-					Volt				= DcModuleManage.SetVolt;
+					Volt				= DcModuleManage_B.SetVolt;
 				}
 				else if (status[i] == Hold_A)
 				{

DcPillar/Src/SmartAllocation/SmartAllocation_B_ChgRun.c

@@ -30,6 +30,7 @@ s32 GetChgCurrtChgRun_B(void)
   return -1;
 }
 
+extern StructDcModuleManage DcModuleManage_All;
 
 void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
 {
@@ -118,7 +119,7 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
 
 			static s16 GetCurrt_bak;
 			if(abs((s16)GetDcModuleCurrt_B()-GetCurrt_bak)<10 //ȶ
-				&& (abs((s16)NeedCurrt-(s16)GetDcModuleCurrt_B())>(DcModuleAbility.MaxCurrt*10))
+				&& (abs((s16)NeedCurrt-(s16)GetDcModuleCurrt_B())>(DcModuleAbility.MaxCurrt))
 			)
 			{
 				if(0 == UniChgTick)

DcPillar/Src/SmartAllocation/SmartAllocation_ChgRun.c

@@ -128,7 +128,7 @@ void ChgProChgRun(StructChargeCtrl * pChargeCtrl)
 			static s16		GetCurrt_bak;
 
 			if (abs((s16) GetDcModuleCurrt() -GetCurrt_bak) < 10 //ȶ
-			&& (abs((s16) NeedCurrt - (s16) GetDcModuleCurrt()) > (DcModuleAbility.MaxCurrt * 10)))
+			&& (abs((s16) NeedCurrt - (s16) GetDcModuleCurrt()) > (DcModuleAbility.MaxCurrt)))
 			{
 				if (0 == UniChgTick)
 					UniChgTick = GetSystemTick();

DcPillar/Src/Thread/Thd_Mult.c

@@ -102,10 +102,14 @@ void LedProcess(void)
     ChgLedSet(eSwSta_Off);
     FaultLedSet(eSwSta_On);
   }
+#if 0
   else if((1 == CurChgRecd.RecordValid)
        || (1 == ReserveParam.ValidFlag)
        ||((NULL != pCurChgRecd_AB) && (1 == pCurChgRecd_AB->RecordValid))
        )
+ #else
+ else if(TCUCurChgRecd.TCUChargeEnable!=0)
+ #endif
   {
     IdleLedSet(eSwSta_Off);
     if((eChgPro_ChgRun == ChargeCtrl.CurProcess)
@@ -131,6 +135,7 @@ void LedProcess(void)
     ChgLedSet(eSwSta_Off);
     FaultLedSet(eSwSta_Off);
   }
+
 }
 
 void LedProcess_B(void)
@@ -169,10 +174,14 @@ void LedProcess_B(void)
     else
       FaultLedSet_B(eSwSta_On);
   }
+	#if 0
   else if((1 == CurChgRecd_B.RecordValid)
         || (1 == ReserveParam_B.ValidFlag)
         ||((NULL != pCurChgRecd_AB) && (1 == pCurChgRecd_AB->RecordValid))
         )
+        #else
+		else  if(TCUCurChgRecd_B.TCUChargeEnable!=0)
+		#endif
   {
     IdleLedSet_B(eSwSta_Off);
     if((eChgPro_B_ChgRun == ChargeCtrl_B.CurProcess)
@@ -664,8 +673,8 @@ void Thd_Mult(void const *parameter)
     }
     else if((3 == DoorChkCnt) && (0 != UserParam.ChgFun.Value.Door))
     {
-      PillarError_B.Value.Door = 1;
-      PillarError.Value.Door = 1;
+      //PillarError_B.Value.Door = 1; //0504 test
+      //PillarError.Value.Door = 1;
     }
     /*防雷器故障检测*/
     if(eSwSta_Off == SPDGet())
@@ -693,8 +702,8 @@ void Thd_Mult(void const *parameter)
     /*网络故障判断 可禁用*/
     if((0 == CommuStatus.ConnectFlag) && (1 == UserParam.HadSigned))
     {
-      PillarError.Value.Net = 1;
-      PillarError_B.Value.Net = 1;
+      PillarError.Value.Net = 0;//1; 0504 屏蔽网络错误
+      PillarError_B.Value.Net = 0;//1; 0504
     }
     else
     {
@@ -753,7 +762,7 @@ void Thd_Mult(void const *parameter)
       PillarError_B.Value.NoDcmod = 0;
     /*B枪位电能表通讯故障判断*/
     if(eMeterSta_Unavail == MeterComm.Status_B)
-      PillarError_B.Value.Meter = 1;
+      ;//PillarError_B.Value.Meter = 1; //0505 屏蔽B枪电表错误
     else
       PillarError_B.Value.Meter = 0;
     /*B枪位绝缘错误判断*/
@@ -827,7 +836,7 @@ void Thd_Mult(void const *parameter)
     }
     else if(20 == ContactorChkCnt_B)
     {
-      PillarError_B.Value.Contactor = 1;
+      //PillarError_B.Value.Contactor = 1;
     }
 	if((PillarError.Value.Emergency == 0) && (ACContactorSta != ACContactorGet()))
     {
@@ -835,8 +844,8 @@ void Thd_Mult(void const *parameter)
         ACContactorChkCnt++;
       else
       {
-        PillarError.Value.ACContactor = 1;
-        PillarError_B.Value.ACContactor = 1;
+        //PillarError.Value.ACContactor = 1;
+        //PillarError_B.Value.ACContactor = 1;
       }
     }
     else
@@ -871,7 +880,7 @@ void Thd_Mult(void const *parameter)
       PillarError.Value.NoDcmod = 0;
     /*电能表通讯故障判断*/
     if(eMeterSta_Unavail == MeterComm.Status)
-      PillarError.Value.Meter = 1;
+      PillarError.Value.Meter = 0;//1; 0504 屏蔽电表错误
     else
       PillarError.Value.Meter = 0;
     /*绝缘错误判断*/
@@ -945,7 +954,7 @@ void Thd_Mult(void const *parameter)
     }
     else if(20 == ContactorChkCnt)
     {
-      PillarError.Value.Contactor = 1;
+      PillarError.Value.Contactor = 0;//1; 0504 test
     }
 
     /*联级接触器故障判断*/