B枪模块切换顺序;模块切换继电器初始化

DcPillar/Src/Drivers/Drv_BoardIo.c

@@ -695,36 +695,36 @@ void DcOutInit_Uni(void)
 
 void DcOutPosSet_Uni(EnumSwitchStatus Set)
 {
-  if(eSwSta_Off == Set)
+  /*if(eSwSta_Off == Set)
     DcOutPos_Uni_Port->BSRRH = DcOutPos_Uni_Pin;
   else
     DcOutPos_Uni_Port->BSRRL = DcOutPos_Uni_Pin;
-  DcOutPosSta_Uni = Set;
+  DcOutPosSta_Uni = Set;*/
 }
 void DcOutNegSet_Uni(EnumSwitchStatus Set)
 {
-  if(eSwSta_Off == Set)
+  /*if(eSwSta_Off == Set)
     DcOutNeg_Uni_Port->BSRRH = DcOutNeg_Uni_Pin;
   else
     DcOutNeg_Uni_Port->BSRRL = DcOutNeg_Uni_Pin;
-  DcOutNegSta_Uni = Set;
+  DcOutNegSta_Uni = Set;*/
 }
 #if 1
 void DcOutSet_Uni(EnumSwitchStatus Set)
 {
   if(eSwSta_Off == Set)
   {
-    DcOutPosSet_Uni(Set);
-    DcOutNegSet_Uni(Set);
-    osTimerStop(DCOutDelayTimer_Uni);
+    //DcOutPosSet_Uni(Set);
+    //DcOutNegSet_Uni(Set);
+    //osTimerStop(DCOutDelayTimer_Uni);
   }
   else if(((eSwSta_Off == DcOutGet()) || (eSwSta_Off == DcOutGet_B()))
        && ((eSwSta_Off == DcOutPosGetSet()) || (eSwSta_Off == DcOutPosGetSet_B()))
          )
   {
     //DcOutPosSet_Uni(Set);
-    DcOutNegSet_Uni(Set);
-    osTimerStart(DCOutDelayTimer_Uni, 200);
+    //DcOutNegSet_Uni(Set);
+    //osTimerStart(DCOutDelayTimer_Uni, 200);
   }
 }
 #else

DcPillar/Src/SmartAllocation/Drv_SmartAllocation_DcModule.c

@@ -539,15 +539,24 @@ void DcModeleRelayInit()
 	GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
 	GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
 	GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
-	GPIO_InitStructure.GPIO_Pin = Fan_Pin;
+	
+	GPIO_InitStructure.GPIO_Pin = RELAY_K1K2_Pin;
 	GPIO_Init(RELAY_K1K2_Port, &GPIO_InitStructure);
 	GPIO_ResetBits(RELAY_K1K2_Port,RELAY_K1K2_Pin);
+	
+	GPIO_InitStructure.GPIO_Pin = RELAY_K3K4_Pin;
 	GPIO_Init(RELAY_K3K4_Port, &GPIO_InitStructure);
 	GPIO_ResetBits(RELAY_K3K4_Port,RELAY_K3K4_Pin);
+	
+	GPIO_InitStructure.GPIO_Pin = RELAY_K5K6_Pin;
 	GPIO_Init(RELAY_K5K6_Port, &GPIO_InitStructure);
 	GPIO_ResetBits(RELAY_K5K6_Port,RELAY_K5K6_Pin);
+
+	GPIO_InitStructure.GPIO_Pin = RELAY_K7K8_Pin;
 	GPIO_Init(RELAY_K7K8_Port, &GPIO_InitStructure);
 	GPIO_ResetBits(RELAY_K7K8_Port,RELAY_K7K8_Pin);
+
+	GPIO_InitStructure.GPIO_Pin = RELAY_K9K10_Pin;
 	GPIO_Init(RELAY_K9K10_Port, &GPIO_InitStructure);
 	GPIO_ResetBits(RELAY_K9K10_Port,RELAY_K9K10_Pin);
 }

DcPillar/Src/SmartAllocation/SmartAllocation_B_ChgRun.c

@@ -134,28 +134,28 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
 							DcModuleGroup[3].status = Hold_B;
 							DcModuleManage_B.ValidNum += DcModuleGroup[3].ValidNum;
 						}
-						else if(DcModuleGroup[2].status == Valid)
-						{
-							DcModuleGroup[2].status = Hold_B;
-							DcModuleManage.ValidNum += DcModuleGroup[2].ValidNum;
-						}
 						else if(DcModuleGroup[1].status == Valid)
 						{
 							DcModuleGroup[1].status = Hold_B;
 							DcModuleManage.ValidNum += DcModuleGroup[1].ValidNum;
 						}
+						else if(DcModuleGroup[0].status == Valid)
+						{
+							DcModuleGroup[0].status = Hold_B;
+							DcModuleManage.ValidNum += DcModuleGroup[0].ValidNum;
+						}
 					}
 					else
 					{
-						if(DcModuleGroup[1].status == Hold_B)
+						if(DcModuleGroup[0].status == Hold_B)
 						{
-							DcModuleGroup[1].status = Valid;
-							DcModuleManage.ValidNum -= DcModuleGroup[1].ValidNum;
+							DcModuleGroup[0].status = Valid;
+							DcModuleManage.ValidNum -= DcModuleGroup[0].ValidNum;
 						}
-						else if(DcModuleGroup[2].status == Hold_B)
+						else if(DcModuleGroup[1].status == Hold_B)
 						{
-							DcModuleGroup[2].status = Valid;
-							DcModuleManage.ValidNum -= DcModuleGroup[2].ValidNum;
+							DcModuleGroup[1].status = Valid;
+							DcModuleManage.ValidNum -= DcModuleGroup[1].ValidNum;
 						}
 						else if(DcModuleGroup[3].status == Hold_B)
 						{