Merge branch 'AW-CCS'

EVSE/Projects/AW-CCS/Apps/LCM/Module_LcmControl.c

@@ -1724,8 +1724,13 @@ void setConnectionAnimation(uint8_t gun_index, uint8_t system_mode)
 //=======================================
 void setGunPluginAnimation(uint8_t gun_index)
 {
-	if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState != CP_STATE_B) ||
-	   (!ShmCharger->gun_info[gun_index].primaryMcuState.socket_e.isSocketEPinOn))
+	if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_B) ||
+	   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_C) ||
+	   (ShmCharger->gun_info[gun_index].primaryMcuState.socket_e.isSocketEPinOn == ON))
+	{
+		setDisplayValue(ICON_PLUGIN_ARROW, PLUGIN_ARROW_2);
+	}
+	else
 	{
 		if((GUN_PLUGING_LEVEL_STATUS ==  GUN_PLUGING_LEVEL_0) && (DiffTimebWithNow(startTime[gun_index][TMR_IDX_PLUGIN]) > (TIME_ANIMATION_PLUGIN)))
 		{
@@ -1739,10 +1744,6 @@ void setGunPluginAnimation(uint8_t gun_index)
 			ftime(&startTime[gun_index][TMR_IDX_PLUGIN]);
 		}
 	}
-	else
-	{
-		setDisplayValue(ICON_PLUGIN_ARROW, PLUGIN_ARROW_2);
-	}
 }
 
 //=======================================

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

@@ -4352,8 +4352,8 @@ int main(void)
 		//==============================================
 		// Something need run in Idle mode
 		//==============================================
-		if(((ShmSysConfigAndInfo->SysInfo.AcChargingData[0].SystemStatus==SYS_MODE_IDLE) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[0].SystemStatus==SYS_MODE_ALARM)) &&
-		   (AC_QUANTITY>1?((ShmSysConfigAndInfo->SysInfo.AcChargingData[1].SystemStatus==SYS_MODE_IDLE) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[1].SystemStatus==SYS_MODE_ALARM)):true))
+		if(((ShmSysConfigAndInfo->SysInfo.AcChargingData[0].SystemStatus==SYS_MODE_IDLE) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[0].SystemStatus==SYS_MODE_ALARM) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[0].SystemStatus==SYS_MODE_DEBUG)) &&
+		   (AC_QUANTITY>1?((ShmSysConfigAndInfo->SysInfo.AcChargingData[1].SystemStatus==SYS_MODE_IDLE) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[1].SystemStatus==SYS_MODE_ALARM) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[1].SystemStatus==SYS_MODE_DEBUG)):true))
 		{
 			// Check restore factory setting request
 			if(ShmSysConfigAndInfo->SysInfo.FactoryConfiguration)