Merge remote-tracking branch 'origin/AW-Regular'

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

@@ -420,6 +420,22 @@ void ocpp_process_start()
 		system("/root/OcppBackend20 &");
 }
 
+uint8_t ocpp_get_isRemoteStartWait()
+{
+	uint8_t result = OFF;
+
+	if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
+	{
+		result = ShmOCPP16Data->MsMsg.bits.isRemoteStartWaitReq;
+	}
+	else if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_20)
+	{
+		result = ShmOCPP20Data->MsMsg.bits.isRemoteStartWaitReq;
+	}
+
+	return result;
+}
+
 uint8_t ocpp_get_connection_status()
 {
 	uint8_t result = OFF;
@@ -1073,6 +1089,26 @@ uint8_t ocpp_isAuthorizeRemoteStart()
 	return result;
 }
 
+uint8_t ocpp_get_freevend_idtag(uint8_t * userId)
+{
+	uint8_t result = NO;
+
+	if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
+	{
+		strcpy((char*)userId, (char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[FreeVendIdtag].ItemData);
+
+		result = YES;
+	}
+	else if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_20)
+	{
+		strcpy((char*)userId, (char*)ShmOCPP20Data->ControllerComponentVariable[ChargingStation_FreeVendIdtag].variableAttribute[0].value);
+
+		result = YES;
+	}
+
+	return result;
+}
+
 //======================================================
 // Check interface status
 //======================================================
@@ -2559,6 +2595,11 @@ int isMatchStartUser(unsigned char gun_index)
 		}
 	}
 
+	DEBUG_INFO("==== isMatchStartUser ==== \n");
+	DEBUG_INFO("tmpUser : %s \n", tmpUser);
+	DEBUG_INFO("StartUserId : %s \n", ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId);
+	DEBUG_INFO("========================== \n");
+
 	return ((strcmp((char*)tmpUser, (char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId)==0)?YES:NO);
 }
 
@@ -2787,9 +2828,9 @@ int isReachableInternet()
 	char buf[512];
 	char tmp[512];
 	
+	// Get ip address & net mask
 	strcpy(cmd, "ifconfig eth0");
 	fp = popen(cmd, "r");
-
 	if(fp != NULL)
 	{
 		while(fgets(buf, sizeof(buf), fp) != NULL)
@@ -2798,7 +2839,6 @@ int isReachableInternet()
 			{
 				sscanf(buf, "%*s%s", tmp);
 				substr(tmp, tmp, strspn(tmp, "addr:"), strlen(buf)-strspn(tmp, "addr:"));
-
 				if (strcmp(tmp, (char *)ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthIpAddress) != 0)
 				{
 					strcpy((char *) ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthIpAddress, tmp);
@@ -2897,7 +2937,7 @@ int isRouteFail()
 int isReservationExpired(unsigned char gun_index)
 {
 	int result = NO;
-	
+
 	if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
 	{
 		if(isOvertNow(ShmOCPP16Data->ReserveNow[gun_index].ExpiryDate))
@@ -3149,6 +3189,15 @@ void checkTask()
 		}
 	}
 
+	if(strcmp((char *)&ShmSysConfigAndInfo->SysConfig.MaintainServerURL,"") != 0)
+	{
+		if(system("pidof -s OcppBackendPH > /dev/null") != 0)
+		{
+			DEBUG_INFO("OcppBackendPH not running, restart it.\n");
+			system("/root/OcppBackendPH &");
+		}
+	}
+
 	if(system("pidof -s Module_AlarmDetect > /dev/null") != 0)
 	{
 		DEBUG_INFO("Module_AlarmDetect not running, restart it.\n");
@@ -3172,13 +3221,6 @@ void checkTask()
 		DEBUG_INFO("Module_ProduceUtils not running, restart it.\n");
 		system ("/root/Module_ProduceUtils &");
 	}
-/*
-	if((system("pidof -s Module_InitUpgrade > /dev/null") != 0) &&
-		ShmSysConfigAndInfo->SysConfig.isReqFirstUpgrade)
-	{
-		DEBUG_INFO("Module_InitUpgrade not running, restart it.\n");
-		system ("/root/Module_InitUpgrade &");
-	}*/
 }
 
 void checkConnectionTimeout()
@@ -3486,6 +3528,8 @@ void checkChargingProfileLimit(uint8_t gun_index)
 
 void checkStopReason(uint8_t gun_index)
 {
+	sleep(2);
+
 	if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
 	{
 		memset(ShmOCPP16Data->StopTransaction[gun_index].IdTag, 0x00, ARRAY_SIZE(ShmOCPP16Data->StopTransaction[gun_index].IdTag));
@@ -3497,9 +3541,10 @@ void checkStopReason(uint8_t gun_index)
 		{
 			sprintf((char*)ShmOCPP16Data->StopTransaction[gun_index].StopReason, "EmergencyStop");
 		}
-		else if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A)
+		else if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A) || (ShmCharger->gun_info[gun_index].isGunUnpluggedBefore == YES))
 		{
 			sprintf((char*)ShmOCPP16Data->StopTransaction[gun_index].StopReason, "EVDisconnected");
+			memcpy((char*)ShmOCPP16Data->StopTransaction[gun_index].IdTag, (char*)ShmOCPP16Data->StartTransaction[gun_index].IdTag, ARRAY_SIZE(ShmOCPP16Data->StopTransaction[gun_index].IdTag));
 		}
 		else if(ShmOCPP16Data->MsMsg.bits.ResetReq)
 		{
@@ -3511,7 +3556,6 @@ void checkStopReason(uint8_t gun_index)
 		else if(ShmCharger->gun_info[gun_index].rfidReq || ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop)
 		{
 			sprintf((char*)ShmOCPP16Data->StopTransaction[gun_index].StopReason, "Local");
-
 			if(!isMatchStartUser(gun_index))
 			{
 				memcpy((char*)ShmOCPP16Data->StopTransaction[gun_index].IdTag, (char*)ShmSysConfigAndInfo->SysConfig.UserId, ARRAY_SIZE(ShmOCPP16Data->StopTransaction[gun_index].IdTag));
@@ -3520,8 +3564,7 @@ void checkStopReason(uint8_t gun_index)
 			{
 				memcpy((char*)ShmOCPP16Data->StopTransaction[gun_index].IdTag, (char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId, ARRAY_SIZE(ShmOCPP16Data->StopTransaction[gun_index].IdTag));
 			}
-
-			DEBUG_INFO("Gun-%d [ IdTag ] : %s \n", gun_index, ShmOCPP16Data->StopTransaction[gun_index].IdTag);
+			DEBUG_INFO("Gun-[%d] : IdTag [ %s ].\n", gun_index, ShmOCPP16Data->StopTransaction[gun_index].IdTag);
 		}
 		else if(ShmOCPP16Data->CsMsg.bits[gun_index].RemoteStopTransactionReq)
 		{
@@ -3535,7 +3578,7 @@ void checkStopReason(uint8_t gun_index)
 		{
 			sprintf((char*)ShmOCPP16Data->StopTransaction[gun_index].StopReason, "Other");
 		}
-		DEBUG_INFO("Gun-%d : StopReason [ %s ]...\n",gun_index,ShmOCPP16Data->StopTransaction[gun_index].StopReason);
+		DEBUG_INFO("Gun-[%d] : StopReason [ %s ].\n",gun_index,ShmOCPP16Data->StopTransaction[gun_index].StopReason);
 
 		ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PowerConsumption = (ShmCharger->gun_info[gun_index].powerConsumption.power_consumption/100.0);
 		ShmOCPP16Data->CpMsg.bits[gun_index].StopTransactionReq = ON;
@@ -3551,7 +3594,7 @@ void checkStopReason(uint8_t gun_index)
 		{
 			sprintf((char*)ShmOCPP20Data->TransactionEvent[gun_index].transactionInfo.stoppedReason, "EmergencyStop");
 		}
-		else if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A)
+		else if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A) || (ShmCharger->gun_info[gun_index].isGunUnpluggedBefore == YES))
 		{
 			sprintf((char*)ShmOCPP20Data->TransactionEvent[gun_index].transactionInfo.stoppedReason, "EVDisconnected");
 		}
@@ -3569,7 +3612,6 @@ void checkStopReason(uint8_t gun_index)
 		else if(ShmCharger->gun_info[gun_index].rfidReq || ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop)
 		{
 			sprintf((char*)ShmOCPP20Data->TransactionEvent[gun_index].transactionInfo.stoppedReason, "Local");
-
 			if(!isMatchStartUser(gun_index))
 			{
 				memcpy((char*)ShmOCPP20Data->TransactionEvent[gun_index].idToken.idToken, (char*)ShmSysConfigAndInfo->SysConfig.UserId, ARRAY_SIZE(ShmOCPP20Data->TransactionEvent[gun_index].idToken.idToken));
@@ -3578,8 +3620,7 @@ void checkStopReason(uint8_t gun_index)
 			{
 				memcpy((char*)ShmOCPP20Data->TransactionEvent[gun_index].idToken.idToken, (char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId, ARRAY_SIZE(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId));
 			}
-
-			DEBUG_INFO("Gun-%d [ idToken ] : %s \n", gun_index, ShmOCPP20Data->TransactionEvent[gun_index].idToken.idToken);
+			DEBUG_INFO("Gun-[%d] : idToken [ %s ].\n", gun_index, ShmOCPP20Data->TransactionEvent[gun_index].idToken.idToken);
 		}
 		else if((ShmCharger->gun_info[gun_index].systemAlarmCode.SystemAlarmCode & ALARM_OVER_CURRENT))
 		{
@@ -3597,7 +3638,7 @@ void checkStopReason(uint8_t gun_index)
 		{
 			sprintf((char*)ShmOCPP20Data->TransactionEvent[gun_index].transactionInfo.stoppedReason, "Other");
 		}
-		DEBUG_INFO("Gun-%d : StopReason [ %s ]...\n", gun_index, ShmOCPP20Data->TransactionEvent[gun_index].transactionInfo.stoppedReason);
+		DEBUG_INFO("Gun-[%d] : StopReason [ %s ].\n", gun_index, ShmOCPP20Data->TransactionEvent[gun_index].transactionInfo.stoppedReason);
 
 		ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PowerConsumption = (ShmCharger->gun_info[gun_index].powerConsumption.power_consumption/100.0);
 		ShmOCPP20Data->CpMsg.bits[gun_index].TransactionEventReq = ON;
@@ -3618,6 +3659,7 @@ void checkRemoteUpgradeStatus()
 		{
 			DEBUG_INFO("Firmware remote upgrading...\n");
 			sprintf((char*)ShmOCPP16Data->FirmwareStatusNotification.Status, "Installing");
+			sleep(1);
 			ShmOCPP16Data->SpMsg.bits.FirmwareStatusNotificationReq = ON;
 			ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = OFF;
 			int result = upgrade_check();
@@ -3687,7 +3729,9 @@ void checkRemoteUpgradeStatus()
 //===============================================
 int main(void)
 {
-	//Create all share memory
+	//==================================================
+	// Create all share memory
+	//==================================================
 	if(CreatShareMemory()==0)
 	{
 		DEBUG_ERROR("CreatShareMemory NG\n");
@@ -3715,12 +3759,14 @@ int main(void)
 		ShmCharger->gun_info[gun_index].isSetLedBrightness = OFF;
 	}
 
+	//==================================================
 	// Main loop
+	//==================================================
 	for(;;)
 	{
-		//==========================================
+		//==============================================
 		// Synchronize share memory from OCPP struct
-		//==========================================
+		//==============================================
 		ShmSysConfigAndInfo->SysInfo.OcppConnStatus = ocpp_get_connection_status();
 
 		//==============================================
@@ -3742,9 +3788,9 @@ int main(void)
 			ftime(&startTime[0][TMR_IDX_CHECK_TASK]);
 		}
 
-		//==========================================
+		//==============================================
 		// 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))
 		{
@@ -3791,15 +3837,15 @@ int main(void)
 			}
 		}
 
-		//==========================================
+		//==============================================
 		// Check remote reset request
-		//==========================================
+		//==============================================
 		checkReset();
 
-		//==========================================
-		// Check RFID
-		//==========================================
-		if(!ShmCharger->gun_info[ShmCharger->gun_selectd].rfidReq)
+		//==============================================
+		// Check RFID authorization
+		//==============================================
+		if((!ShmCharger->gun_info[ShmCharger->gun_selectd].rfidReq) && (ShmSysConfigAndInfo->SysConfig.AuthorisationMode != AUTH_MODE_DISABLE))
 		{
 			if(GetCardSerialNumber()!= FAIL)
 			{
@@ -3807,9 +3853,9 @@ int main(void)
 			}
 		}
 
-		//==========================================
+		//==============================================
 		// Connector loop
-		//==========================================
+		//==============================================
 		for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
 		{
 			// Synchronize current rating value from MCU
@@ -3840,10 +3886,14 @@ int main(void)
 				}
 			}
 
+			//==========================================
 			// Reservation request check
+			//==========================================
 			checkReservation(gun_index);
 
+			//==========================================
 			// Change availability check
+			//==========================================
 			checkAvailability(gun_index);
 
 			if(ShmCharger->gun_info[gun_index].isOperactive)
@@ -3861,10 +3911,14 @@ int main(void)
 				}
 			}
 
+			//==========================================
 			// Unlock Connector signal check
+			//==========================================
 			checkUnlocker(gun_index);
 
+			//==========================================
 			// Connector process
+			//==========================================
 			switch(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus)
 			{
 				case SYS_MODE_BOOTING:
@@ -3936,6 +3990,7 @@ int main(void)
 						setRelay(gun_index,OFF);
 						setRequest(gun_index,OFF);
 						ShmCharger->gun_info[gun_index].isGunPlugged = NO;
+						ShmCharger->gun_info[gun_index].isGunUnpluggedBefore = NO;
 						ShmCharger->gun_info[gun_index].rfidReq = OFF;
 						ShmCharger->gun_info[gun_index].bleConfigData.isRequestStart = OFF;
 						ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop = OFF;
@@ -3947,7 +4002,6 @@ int main(void)
 						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration = 0;
 						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedEnergy = 0;
 						ShmCharger->gun_info[gun_index].targetCurrent = 0xFF;
-
 						ocpp_set_unlocker_req(gun_index, OFF);
 						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].ReservationId = -1;
 
@@ -3955,6 +4009,11 @@ int main(void)
 						ocpp_set_stoptransaction_conf(gun_index, OFF);
 					}
 
+					if(ocpp_get_isRemoteStartWait())
+						setLedMotion(gun_index,LED_ACTION_CONNECTED);
+					else
+						setLedMotion(gun_index,LED_ACTION_IDLE);
+
 					if(((ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_B)) ||
 					   ((ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_C)) ||
 					   (ShmCharger->gun_info[gun_index].rfidReq == ON) ||
@@ -4027,7 +4086,8 @@ int main(void)
 						else
 						{
 							ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod = START_METHOD_FREE;
-							memcpy(ShmSysConfigAndInfo->SysConfig.UserId, ShmSysConfigAndInfo->SysConfig.SerialNumber, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.SerialNumber));
+							//memcpy(ShmSysConfigAndInfo->SysConfig.UserId, ShmSysConfigAndInfo->SysConfig.SerialNumber, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.SerialNumber));
+							ocpp_get_freevend_idtag(ShmSysConfigAndInfo->SysConfig.UserId);
 							DEBUG_INFO("Start Method : FREE...\n");
 						}
 
@@ -4035,6 +4095,7 @@ int main(void)
 						ocpp_set_remotestart(gun_index, OFF);
 						ShmCharger->gun_info[gun_index].bleConfigData.isRequestStart = OFF;
 						ShmCharger->gun_info[gun_index].isGunPlugged = NO;
+						ShmCharger->gun_info[gun_index].isGunUnpluggedBefore = NO;
 						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].schedule.isTriggerStart = OFF;
 
 						// Get target current
@@ -4216,22 +4277,14 @@ int main(void)
 					{
 						ftime(&startTime[gun_index][TMR_IDX_HANDSHAKING]);
 						setLedMotion(gun_index,LED_ACTION_CONNECTED);
+						ocpp_set_profile_req(gun_index, ON);
 					}
 
-					// If control pilot detect Bx, skip watch dog time out.
-					/*
-					if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_B) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_C))
-					{
-						setRequest(gun_index,ON);
-						ftime(&startTime[gun_index][TMR_IDX_HANDSHAKING]);
-						ShmCharger->gun_info[gun_index].isGunPlugged = YES;
-					}
-					*/
-
 					// Unplug charging gun to Idle mode
 					if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A) && (ShmCharger->gun_info[gun_index].isGunPlugged == YES))
 					{
 						DEBUG_INFO("Charging gun is plugged before.\n");
+						ShmCharger->gun_info[gun_index].isGunUnpluggedBefore = YES;
 						setChargerMode(gun_index, SYS_MODE_IDLE);
 					}
 
@@ -4247,10 +4300,10 @@ int main(void)
 						ShmCharger->gun_info[gun_index].rfidReq = OFF;
 					}
 
+					// Handshaking timeout and the system back to idle
 					if(DiffTimebWithNow(startTime[gun_index][TMR_IDX_HANDSHAKING]) > ShmCharger->timeoutSpec.Present_Timeout_Spec)
 					{
 						setLedMotion(gun_index, LED_ACTION_HANDSHAKE_FAIL);
-
 						if(DiffTimebWithNow(startTime[gun_index][TMR_IDX_HANDSHAKING]) > (ShmCharger->timeoutSpec.Present_Timeout_Spec+5000))
 						{
 							DEBUG_INFO("Handshaking timeout...\n");
@@ -4262,7 +4315,8 @@ int main(void)
 						setRequest(gun_index,ON);
 						ftime(&startTime[gun_index][TMR_IDX_HANDSHAKING]);
 						ShmCharger->gun_info[gun_index].isGunPlugged = YES;
-						
+						ShmCharger->gun_info[gun_index].isGunUnpluggedBefore = NO;
+
 						// Set relay on when the system is state C
 						if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_C)
 							setRelay(gun_index, ON);
@@ -4297,8 +4351,14 @@ int main(void)
 						ocpp_set_profile_req(gun_index, ON);
 						ShmCharger->gun_info[gun_index].isChargerStopByCondition = NO;
 					}
+					if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A)
+					{
+						ShmCharger->gun_info[gun_index].isGunUnpluggedBefore = YES;
+						DEBUG_INFO("Unplugged the charging gun during charging. \n");
+					}
 
-					if((ShmCharger->gun_info[gun_index].rfidReq == ON) ||
+					if((ShmCharger->gun_info[gun_index].isGunUnpluggedBefore == YES) ||
+					   (ShmCharger->gun_info[gun_index].rfidReq == ON) ||
 					   (ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop == ON) ||
 					   ocpp_get_remotestop(gun_index) ||
 					   (ocpp_get_connection_status() && !ocpp_get_starttransaction_result(gun_index)) ||
@@ -4634,7 +4694,10 @@ int main(void)
 						getDateTimeString((char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StopDateTime);
 						startTime[gun_index][TMR_IDX_AUTH].time -= TIMEOUT_SPEC_AUTH;
 						
-						sleep(3);
+						if(ShmCharger->gun_info[gun_index].isGunUnpluggedBefore == YES)
+							setRelay(gun_index, OFF);
+
+						sleep(1);
 					}
 
 					// End authorize pass
@@ -4643,7 +4706,7 @@ int main(void)
 					   (ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop == ON) ||
 					   ocpp_get_remotestop(gun_index) ||
 					   (ocpp_get_connection_status() && !ocpp_get_starttransaction_result(gun_index)) ||
-					   ((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A) && ocpp_get_StopTransactionOnEVSideDisconnect()) ||
+					   (((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A) || (ShmCharger->gun_info[gun_index].isGunUnpluggedBefore == YES)) && ocpp_get_StopTransactionOnEVSideDisconnect()) ||
 					   ocpp_get_reset_req() ||
 					   ocpp_get_unlocker_req(gun_index) ||
 					   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].schedule.isTriggerStop == ON))
@@ -4897,7 +4960,8 @@ int main(void)
 							ftime(&startTime[gun_index][TMR_IDX_LOGPPRINTOUT]);
 						}
 
-						if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_C) &&
+						if((ShmCharger->gun_info[gun_index].isGunUnpluggedBefore != YES) &&
+						   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_C) &&
 						   (ShmCharger->gun_info[gun_index].rfidReq != ON) &&
 						   (ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop != ON)  &&
 						   !ocpp_get_remotestop(gun_index) &&
@@ -4931,6 +4995,7 @@ int main(void)
 						ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop = OFF;
 						ocpp_set_remotestop(gun_index, OFF);
 						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].schedule.isTriggerStop = OFF;
+						ShmCharger->gun_info[gun_index].isGunUnpluggedBefore = NO;
 
 						DB_Insert_Record(localDb, gun_index);
 						setChargerMode(gun_index, SYS_MODE_IDLE);

EVSE/Projects/AW-Regular/Apps/main.h

@@ -424,6 +424,7 @@ typedef struct GUN_INFO
 	uint16_t										isUnlockerConnetor:1;
 	uint16_t										isOperactive:1;
 	uint16_t										isChargerStopByCondition:1;
+	uint16_t										isGunUnpluggedBefore:1;
 }Gun_Info;
 
 struct Charger