修复一处错误;修改模块启动逻辑开机改为多次发送

DcPillar/Src/SmartAllocation/Drv_SmartAllocation.c

@@ -137,7 +137,7 @@ void DcModuleManageProcess_SmartAllocation(void)
 		for (j = 0; j < DcModuleGroup[i].num; j++)
 		{
 			addr				= DcModuleGroup[i].modules[j].addr;
-			Flag				= addr << 1;
+			Flag				= 1 << addr;
 
 			DcModuleGroup[i].modules[j].status = DcModuleStatus_ALL[addr].State;
 				
@@ -813,16 +813,18 @@ void SendDataToDcModule_ZhongXing(u8 group_index, u8 cmd, u32 volt, u32 current)
 			0x05 --- 参数修改
 			0x06 --- 停止充电， 自动清除分组组号
 		*/
-		sendCmd = 0x01;
-		if(ChargeCtrl.CurProcess == eChgPro_ChgRun 
-			&& DcModuleGroup[group_index].status == Hold_A)
+		sendCmd = 0x03;
+		if(ChargeCtrl.CurProcess == eChgPro_ImdCheck \
+			&& DcModuleGroup[group_index].status == Hold_A \
+			&& group_index == 0)
 		{
-			sendCmd = 0x05;
+			sendCmd = 0x01;
 		}
-		else if(ChargeCtrl_B.CurProcess == eChgPro_ChgRun 
-			&& DcModuleGroup[group_index].status == Hold_B)
+		else if(ChargeCtrl_B.CurProcess == eChgPro_ImdCheck \
+			&& DcModuleGroup[group_index].status == Hold_B \
+			&& group_index == 2)
 		{
-			sendCmd = 0x05;
+			sendCmd = 0x01;
 		}
 	}
 	
@@ -852,6 +854,15 @@ void SendDataToDcModule_ZhongXing(u8 group_index, u8 cmd, u32 volt, u32 current)
 				//osDelay(10);
 			}
 		}
+
+		if(sendCmd != 0x02) //非停止充电,下发修改充电参数
+		{
+			DataSend.Data[0]	= 0x10 | 0x05;
+			if (pdTRUE != xQueueSend(DcModeMsg, &DataSend, 0))
+			{
+				//osDelay(10);
+			}
+		}
 	}
 	
 }
@@ -1155,7 +1166,6 @@ void SendDataToDcModule_B(EnumSwitchStatus Set, u16 Volt, u16 Currt)
 		cmd = 0x55;//机
 	}
 	DcModuleSet_B(Set,Volt,Currt);
-	Currt = 2;
 	SendDataToDcModule(2,cmd,Volt*100,Currt*100);
 }