[Improve][AW-CCS][main.c]

2022-08-15 / EASON YANG
Action:
1. Improve : checkRfidAuthrize() function. save lastIdtag to compare to UserId.

File:
1. main.c
Action 1

FIRMWARE VERSION: B0.62.XX.XXXX.PX

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

@@ -5002,6 +5002,7 @@ void checkRfidAuthrize()
 {
 	static uint8_t isCheckdResult = FALSE;
 	static uint8_t isReadable = TRUE;
+	static uint8_t lastIdtag[ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.UserId)];
 	uint8_t isStartByWrongReservation = NO;
 
 	if(!ShmCharger->isAuthrizing)
@@ -5057,13 +5058,13 @@ void checkRfidAuthrize()
 				DEBUG_INFO("Authorize request User Id : %s\n", bufferRFID);
 				//DEBUG_INFO("Authorize request User Id : %s\n", ShmSysConfigAndInfo->SysConfig.UserId);
 
-				for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+				for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 					ShmCharger->gun_info[gun_index].resultAuthorization = UNKNOW_RFID;
 
 				// Check SN already start
-				for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+				for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 				{
-					if(isMatchStartUser(gun_index) || (isMatchPresentUser(gun_index) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_PREPARING) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A)))
+					if(isMatchStartUser(gun_index) || (isMatchPresentUser(gun_index) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_PREPARING)))
 					{
 						DEBUG_INFO("%s running on connector-%02d.\n", ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId, gun_index);
 						isSnStart = TRUE;
@@ -5080,6 +5081,7 @@ void checkRfidAuthrize()
 				// Request authorize if isSnStart is false
 				if(!isSnStart)
 				{
+					memcpy(lastIdtag, ShmSysConfigAndInfo->SysConfig.UserId, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.UserId));
 					memcpy(ShmSysConfigAndInfo->SysConfig.UserId, bufferRFID, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.UserId));
 					refreshStartTimer(&startTime[0][TMR_IDX_AUTH]);
 					ocpp_set_auth_conf(OFF);
@@ -5105,7 +5107,7 @@ void checkRfidAuthrize()
 		{
 			// Authorization timeout process.
 			DEBUG_WARN("Authorize timeout !!!\n");
-			for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+			for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 			{
 				ShmCharger->gun_info[gun_index].resultAuthorization = UNVALIDATED_RFID;
 				setLedMotion(gun_index,LED_ACTION_RFID_FAIL);
@@ -5138,7 +5140,7 @@ void checkRfidAuthrize()
 							ocpp_set_auth_conf(ON);
 						}
 
-						for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+						for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 						{
 							if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_RESERVATION) &&
 							   (strcmp((char*)ShmSysConfigAndInfo->SysConfig.UserId, (char*)ShmOCPP16Data->ReserveNow[gun_index].IdTag) != 0))
@@ -5160,7 +5162,7 @@ void checkRfidAuthrize()
 						}
 					}
 
-					for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+					for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 						checkHandshakeCountdown(gun_index);
 
 					if((getDiffSecNow(startTime[0][TMR_IDX_GUN_DETECT]) < (ocpp_get_connection_timeout())) && (isStartByWrongReservation != YES))
@@ -5172,10 +5174,13 @@ void checkRfidAuthrize()
 								if(isMatchPresentUser())
 								{
 									DEBUG_INFO("Cancel present user.\n");
-									for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+									for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 									{
 										setLedMotion(gun_index,LED_ACTION_IDLE);
 										ShmCharger->gun_info[gun_index].resultAuthorization = DEFAULT_RFID;
+
+										if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_PREPARING)
+											ShmCharger->gun_info[gun_index].rfidReq = ON;
 									}
 
 									setSpeaker(ON, SPEAKER_SHORT);
@@ -5187,7 +5192,7 @@ void checkRfidAuthrize()
 						}
 						else
 						{
-							for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+							for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 							{
 								if(getDiffSecNow(startTime[0][TMR_IDX_GUN_DETECT]) < 3)
 									setLedMotion(gun_index,LED_ACTION_RFID_PASS);
@@ -5195,7 +5200,7 @@ void checkRfidAuthrize()
 									setLedMotion(gun_index,LED_ACTION_AUTHED);
 
 								if((((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_IDLE) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_RESERVATION)) && (((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) || (modelnameInfo.GetGunCount == 1))) ||
-								   ((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_PREPARING) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_B) && (ShmCharger->gun_selectd == gun_index)) ||
+								   ((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_PREPARING) && (ShmCharger->gun_selectd == gun_index)) ||
 								   (((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_CHARGING) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_TERMINATING)) && (ShmCharger->gun_selectd == gun_index))
 								   )
 								{
@@ -5214,14 +5219,14 @@ void checkRfidAuthrize()
 					else
 					{
 						if(isStartByWrongReservation != YES)
-							DEBUG_INFO("Connector action detect timeout. \n");
+							DEBUG_INFO("Connector action detect timeout.\n");
 						else
 							DEBUG_INFO("User Id and reservation IdTag is not match. \n");
 
 						ShmCharger->isAuthrizing = FALSE;
 						ShmCharger->isGetAuthResult = TRUE;
 
-						for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+						for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 						{
 							if(isStartByWrongReservation != YES)
 							{
@@ -5245,7 +5250,7 @@ void checkRfidAuthrize()
 					ShmCharger->isAuthrizing = FALSE;
 					ShmCharger->isGetAuthResult = TRUE;
 
-					for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+					for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 					{
 						ShmCharger->gun_info[gun_index].resultAuthorization = UNVALIDATED_RFID;
 						setLedMotion(gun_index,LED_ACTION_RFID_FAIL);
@@ -5254,15 +5259,30 @@ void checkRfidAuthrize()
 					setSpeaker(ON,SPEAKER_INTERVAL_3COUNT);
 					sleep(3);
 
-					for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+					for(int gun_index = 0;gun_index<modelnameInfo.GetGunCount;gun_index++)
 					{
 						if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_PREPARING))
-						{
 							setLedMotion(gun_index,LED_ACTION_AUTHED);
-						}
 						else
-						{
 							setLedMotion(gun_index,LED_ACTION_IDLE);
+
+						if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_PREPARING) && (ShmCharger->gun_selectd == gun_index))
+						{
+							switch(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod)
+							{
+								case START_METHOD_BACKEND:
+									ocpp_copy_userid_from_remotestart(gun_index);
+									break;
+
+								default:
+									memcpy(ShmSysConfigAndInfo->SysConfig.UserId, lastIdtag, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.UserId));
+									DEBUG_INFO("==========================================\n");
+									DEBUG_INFO("Copy lastIdtag into UserId. \n");
+									DEBUG_INFO("lastIdtag : [%s] ---> UserId : [%s] . \n", lastIdtag, ShmSysConfigAndInfo->SysConfig.UserId);
+									DEBUG_INFO("==========================================\n");
+
+									break;
+							}
 						}
 					}
 				}
@@ -6579,7 +6599,7 @@ int main(void)
 					}
 
 					// Use RFID card to stop handshaking
-					if((ShmCharger->gun_info[gun_index].rfidReq == ON) && isMatchStartUser(gun_index))
+					if((ShmCharger->gun_info[gun_index].rfidReq == ON))
 					{
 						DEBUG_INFO("Use RFID card to stop handshaking.\n");
 						//Cancel CCS task negotiating