2021-07-28 / Eason Yang

Action:
1. Improve: Page idle => page authorization => page preparing process.
2. Improve: When the system change to idle page logic.

File:
1. main.c
Action 1

2. Module_LcmControl
Action 2

Image version: D0.55.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N: XXXXXXXX
Hardware version: XXXXXXXX

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

@@ -275,7 +275,7 @@ void page_booting()
 
 void page_idle(uint8_t gun_index, uint8_t system_mode)
 {
-	if(getCurrentPage() != SYSTEM_SCREEN_IDLE)
+	if((getCurrentPage() != SYSTEM_SCREEN_IDLE) && (ShmCharger->gun_info[gun_index].resultAuthorization != VALIDATED_RFID))
 	{
 		setCurrentPage(SYSTEM_SCREEN_IDLE);
 		setDefaultValue(gun_index, system_mode);
@@ -376,7 +376,6 @@ void page_charging(uint8_t gun_index, uint8_t system_mode)
 	}
 	else
 	{
-		//setAuthorizationPage(gun_index);
 		setConnectionAnimation(gun_index, system_mode);
 		setBatteryAnimation(gun_index, system_mode);
 		setPresentChargedDuration(gun_index);
@@ -447,7 +446,6 @@ void page_terminating(uint8_t gun_index, uint8_t system_mode)
 	}
 	else
 	{
-		//setAuthorizationPage(gun_index);
 		setConnectionAnimation(gun_index, system_mode);
 		setBatteryAnimation(gun_index, system_mode);
 		setPresentChargedDuration(gun_index);
@@ -862,7 +860,7 @@ void setPriceFromWebsite(float monry_rate)
 }
 
 //=======================================
-// Setting final cost
+// Setting final cost ( WEB PAGE )
 //=======================================
 void setPresentFinalCost(float cost)
 {
@@ -877,7 +875,7 @@ void setPresentFinalCost(float cost)
 }
 
 //=======================================
-// Getting final cost
+// Getting final cost ( WEB PAGE )
 //=======================================
 float getPresentFinalCost(uint8_t gun_index)
 {

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

@@ -4405,7 +4405,10 @@ void checkRfidAuthrize()
 							{
 								DEBUG_INFO("Cancel present user.\n");
 								for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+								{
 									setLedMotion(gun_index,LED_ACTION_IDLE);
+									ShmCharger->gun_info[gun_index].resultAuthorization = DEFAULT_RFID;
+								}
 								ShmCharger->isAuthrizing = FALSE;
 							}
 						}
@@ -4440,7 +4443,10 @@ void checkRfidAuthrize()
 						ShmCharger->isGetAuthResult = TRUE;
 
 						for(int gun_index = 0;gun_index<AC_QUANTITY;gun_index++)
+						{
 							setLedMotion(gun_index,LED_ACTION_IDLE);
+							ShmCharger->gun_info[gun_index].resultAuthorization = DEFAULT_RFID;
+						}
 					}
 				}
 				else