2021-04-19 / Eason Yang

Action
1. Fixed : PresentChargedDuration should be counting when the charger change mode to terminating.
2. Fixed : Respond for resultAuthorization to LCM.
3. Fixed : Replace the QR code constant.
4. Added : Footer into LCM.

File
1. main.c
Action 1
Action 2

2. lcmCommm_dgus.h
Action 3

3. Module_LcmControl.c
Action 4

Version : D0.49.XX.XXXX.XX

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

@@ -282,10 +282,13 @@ void page_idle(uint8_t gun_index, uint8_t system_mode)
 		setRfidIcon();
 		setQRCodeIcon();
 
-		//if(isCharging == YES)
-			//PERCENTAGE = 0;
-		//else
-			//PERCENTAGE = 100;
+		if(isEmulator == YES)
+		{
+			//if(isCharging == YES)
+				//PERCENTAGE = 0;
+			//else
+				//PERCENTAGE = 100;
+		}
 
 		//DEBUG_INFO("Page idle.\n");
 	}
@@ -373,10 +376,8 @@ void page_charging(uint8_t gun_index, uint8_t system_mode)
 		ftime(&startTime[gun_index][TMR_IDX_CONNECTION]);
 		BATTERY_LEVEL_STATUS = BATTERY_LEVEL_5;
 		CONNECTION_LEVEL_STATUS = CONNECTION_LEVEL_0;
-
 		DEBUG_INFO("Setting page to charging.\n");
 
-
 		//isChange = 0;
 		//ftime(&startTime[gun_index][TMR_IDX_EMULATOR]);
 	}
@@ -454,7 +455,6 @@ void page_terminating(uint8_t gun_index, uint8_t system_mode)
 		ftime(&startTime[gun_index][TMR_IDX_CONNECTION]);
 		BATTERY_LEVEL_STATUS = BATTERY_LEVEL_5;
 		CONNECTION_LEVEL_STATUS = CONNECTION_LEVEL_0;
-
 		DEBUG_INFO("Setting page to terminating.\n");
 	}
 	else
@@ -531,7 +531,6 @@ void page_maintain()
 	if(getCurrentPage() != SYSTEM_SCREEN_MAINTAIN)
 	{
 		setCurrentPage(SYSTEM_SCREEN_MAINTAIN);
-
 		DEBUG_INFO("Setting page to maintain.\n");
 	}
 	else
@@ -545,7 +544,6 @@ void page_update()
 	if(getCurrentPage() != SYSTEM_SCREEN_MAINTAIN)
 	{
 		setCurrentPage(SYSTEM_SCREEN_MAINTAIN);
-
 		DEBUG_INFO("Setting page to update.\n");
 	}
 	else
@@ -569,7 +567,6 @@ void page_debug()
 	if(getCurrentPage() != SYSTEM_SCREEN_MAINTAIN)
 	{
 		setCurrentPage(SYSTEM_SCREEN_MAINTAIN);
-
 		DEBUG_INFO("Setting page to debug.\n");
 	}
 	else
@@ -588,7 +585,6 @@ void page_header(uint8_t gun_index, uint8_t system_mode)
 	setEthernetIcon();
 	setBackendIcon();
 	setWifi4GIcon();
-	setRTC();
 	setWarningStatus(gun_index);
 
 	// Set LCM to save energy mode
@@ -604,6 +600,7 @@ void page_header(uint8_t gun_index, uint8_t system_mode)
 	}
 	else
 	{
+		// Every 2 seconds to update price
 		if(DiffTimebWithNow(startTime[gun_index][TMR_IDX_PRICE]) > (TIME_REFRESH_TIME))
 		{
 			ftime(&startTime[gun_index][TMR_IDX_PRICE]);
@@ -614,6 +611,13 @@ void page_header(uint8_t gun_index, uint8_t system_mode)
 	//DEBUG_INFO("Page heading.\n");
 }
 
+void page_footer()
+{
+	setRTC();
+
+	//DEBUG_INFO("Page footer.\n");
+}
+
 //=======================================
 // Setting icon display value
 //=======================================
@@ -1538,7 +1542,6 @@ void setBatteryAnimation(uint8_t gun_index, uint8_t system_mode)
 					{
 						if(isCharging == YES)
 							PERCENTAGE++;
-
 						else
 							PERCENTAGE--;
 
@@ -2092,6 +2095,8 @@ int main(void)
 		}
 
 		page_header(ShmCharger->gun_selectd, ShmSysConfigAndInfo->SysInfo.AcChargingData[ShmCharger->gun_selectd].SystemStatus);
+		page_footer();
+
 		usleep(100000);
 	}
 

EVSE/Projects/AW-CCS/Apps/LCM/lcmComm_dgus.h

@@ -141,9 +141,9 @@
 #define BATTERY_SOC_80						0x05
 #define BATTERY_SOC_100						0x06
 #define CONNECTION_COMPLETE_MARK			0x01
-#define QRCODE_DISABLE						0x01
+#define QRCODE_BANDED						0x01
 #define QRCODE_ENABLE 						0x02
-#define QRCODE_BANDED						0x03
+#define QRCODE_DISABLE						0x03
 
 //=======================================
 // Icon variable address start from 1000

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

@@ -1,6 +1,7 @@
 #include	"define.h"
 #include 	"main.h"
 
+
 //==========================
 // System basic sample constant
 //==========================
@@ -4200,7 +4201,6 @@ int main(void)
 									else
 									{
 										ShmCharger->gun_info[gun_index].resultAuthorization = UNVALIDATED_RFID;
-																				 
 										DEBUG_INFO("Authorize fail.\n");
 										setSpeaker(ON,SPEAKER_INTERVAL_3COUNT);
 										setLedMotion(gun_index,LED_ACTION_RFID_FAIL);
@@ -4376,6 +4376,7 @@ int main(void)
 									memcpy((char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId, ShmSysConfigAndInfo->SysConfig.UserId, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.UserId));
 									ocpp_copy_userid_to_starttransaction(gun_index);
 									ocpp_set_starttransaction_req(gun_index, ON);
+									ftime(&startChargingTime[gun_index]);
 
 									setChargerMode(gun_index, SYS_MODE_CHARGING);
 								}
@@ -4478,6 +4479,7 @@ int main(void)
 									ocpp_set_starttransaction_req(gun_index, ON);
 									ShmCharger->gun_info[gun_index].isCCSStartTransation = OFF;
 									setChargerMode(gun_index, SYS_MODE_CHARGING);
+									ftime(&startChargingTime[gun_index]);
 									ftime(&startTime[gun_index][TMR_IDX_CCS_HEARTBEAT_COUNT_RESET]);
 								}
 
@@ -4518,7 +4520,7 @@ int main(void)
 							setRelay(gun_index,ON);
 						ocpp_copy_userid_to_starttransaction(gun_index);
 						ocpp_set_starttransaction_req(gun_index, ON);
-
+						ftime(&startChargingTime[gun_index]);
 						setChargerMode(gun_index, SYS_MODE_CHARGING);
 					}
 
@@ -4580,7 +4582,7 @@ int main(void)
 					if(isModeChange(gun_index))
 					{
 						ShmCharger->gun_info[gun_index].rfidReq = OFF;
-						ftime(&startChargingTime[gun_index]);
+						//ftime(&startChargingTime[gun_index]);
 						ftime(&startTime[gun_index][TMR_IDX_LOGPPRINTOUT]);
 						ftime(&startTime[gun_index][TMR_IDX_PROFILE_PREPARE]);
 						ftime(&startTime[gun_index][TMR_IDX_PWN_CHANGE]);
@@ -4736,6 +4738,7 @@ int main(void)
 										}
 										else
 										{
+											ShmCharger->gun_info[gun_index].resultAuthorization = UNVALIDATED_RFID;
 											ShmCharger->gun_info[gun_index].rfidReq = OFF;
 											ocpp_set_auth_req(OFF);
 											DEBUG_INFO("Authorize fail.\n");
@@ -4989,11 +4992,6 @@ int main(void)
 				case SYS_MODE_TERMINATING:
 					if(isModeChange(gun_index))
 					{
-						if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration != 0)
-						{
-							ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration = DiffTimeb(startChargingTime[gun_index], endChargingTime[gun_index])/1000;
-						}
-
 						if(!ShmCharger->gun_info[gun_index].primaryMcuState.relay_state)
 						{
 							setLedMotion(gun_index, LED_ACTION_STOP);
@@ -5005,6 +5003,12 @@ int main(void)
 						ShmCharger->gun_info[gun_index].resultAuthorization = DEFAULT_RFID;
 					}
 
+					ftime(&endChargingTime[gun_index]);
+					if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration != 0)
+					{
+						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration = DiffTimeb(startChargingTime[gun_index], endChargingTime[gun_index])/1000;
+					}
+
 					// End authorize pass
 					if(((ShmCharger->gun_info[gun_index].rfidReq == ON) && isMatchStartUser(gun_index)) ||
 					   (ShmCharger->gun_info[gun_index].isAuthPassEnd) ||