Merge branch 'AW-CCS' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x into AW-CCS

EVSE/Projects/AW-CCS/Apps/main.c

@@ -5484,7 +5484,7 @@ int main(void)
 					   ((ShmCharger->gun_info[gun_index].chargingMode == CHARGING_MODE_HLC) && ShmCharger->gun_info[gun_index].acCcsInfo.EVChargeProgress == HLC_STANDBY_MODE))
 					{
 						setChargerMode(gun_index, SYS_MODE_TERMINATING);
-						setRelay(gun_index, OFF);
+						//setRelay(gun_index, OFF);
 					}
 					else
 					{
@@ -5748,12 +5748,15 @@ int main(void)
 					   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].schedule.isTriggerStop == ON) ||
 					   ((ShmCharger->gun_info[gun_index].chargingMode == CHARGING_MODE_HLC) && (ShmCharger->gun_info[gun_index].acCcsInfo.EVChargeProgress == HLC_STOP_MODE)))
 					{
-						setRelay(gun_index, OFF);
+						//setRelay(gun_index, OFF);
 						setLedMotion(gun_index, LED_ACTION_STOP);
 
 						if(ShmCharger->gun_info[gun_index].chargingMode == CHARGING_MODE_BS)
 						{
+							ShmCharger->gun_info[gun_index].primaryMcuCp_Pwn_Duty.max_current = CCS_PWM_DUTY_100;
+							ShmCharger->gun_info[gun_index].mcuFlag.isSetCpPwmDuty = ON;
 							checkStopReason(gun_index);
+							sleep(6);
 							setChargerMode(gun_index, SYS_MODE_COMPLETE);
 						}
 						else if(ShmCharger->gun_info[gun_index].chargingMode == CHARGING_MODE_HLC)
@@ -5818,9 +5821,10 @@ int main(void)
 					if(isModeChange(gun_index))
 					{
 						setLedMotion(gun_index, LED_ACTION_STOP);
+						sleep(2);
 						setRelay(gun_index, OFF);
 						setRequest(gun_index, OFF);
-						sleep(15);
+						sleep(13);
 					}
 					
 					if(((ShmCharger->gun_info[gun_index].chargingMode != CHARGING_MODE_SOCKETE) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A)) ||