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

2022-08-03 / EASON YANG
Action:
1.Improve: page_complete(). If StopTransaction id is not match with FinalCost txId. Don't display receipt of qr code.

File:
1. Module_LcmControl.c
Action 1

FIRMWARE VERSION: B0.62.XX.XXXX.PX
LCM VERSION: V0.30

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

@@ -2,9 +2,9 @@
  * Module_LcmControl.c
  *
  * Created on : 2020-10-20
- * Update on : 2022-05-27
+ * Update on : 2022-08-03
  * Author : Folus Wen, Eason Yang
- * Version : V0.29
+ * Version : V0.30
  *
  */
 
@@ -132,7 +132,7 @@ int Uart1Fd;
 //=======================================
 // Record version and date
 //=======================================
-char *FIRMWARE_UPDATE_IMAGE[3] = {"V0.29", "2022-05-27", "REV.03.00"};
+char *FIRMWARE_UPDATE_IMAGE[3] = {"V0.30", "2022-08-03", "REV.03.00"};
 
 //=======================================
 // Common routine
@@ -643,28 +643,48 @@ void page_complete(uint8_t gun_index, uint8_t system_mode)
 	}
 	else
 	{
-		if((strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppReceiptrURL,"") == 0))
+		if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
 		{
-			if(getCurrentPage() != SYSTEM_SCREEN_COMPLETE)
+			if(ShmOCPP16Data->StopTransaction[gun_index].TransactionId != ShmOCPP16Data->Cost.FinalCost[gun_index].txId)
 			{
-				setCurrentPage(SYSTEM_SCREEN_COMPLETE);
-				DEBUG_INFO("Setting page to complete.\n");
+				if(getCurrentPage() != SYSTEM_SCREEN_COMPLETE)
+				{
+					setCurrentPage(SYSTEM_SCREEN_COMPLETE);
+					DEBUG_INFO("Setting page to complete.\n");
+				}
+				else
+				{}
 			}
 			else
-			{}
+			{
+				if((strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppReceiptrURL,"") != 0))
+				{
+					if(getCurrentPage() != SYSTEM_SCREEN_COMPLETE_WITH_QRCODE)
+					{
+						setCurrentPage(SYSTEM_SCREEN_COMPLETE_WITH_QRCODE);
+						setQRCodeReceipt(gun_index);
+						DEBUG_INFO("Setting page to complete with receipt QR code [CDFA 1.0].\n");
+					}
+					else
+					{
+						setQRCodeReceipt(gun_index);
+					}
+				}
+				else
+				{
+					if(getCurrentPage() != SYSTEM_SCREEN_COMPLETE)
+					{
+						setCurrentPage(SYSTEM_SCREEN_COMPLETE);
+						DEBUG_INFO("Setting page to complete.\n");
+					}
+					else
+					{}
+				}
+			}
 		}
 		else
 		{
-			if(getCurrentPage() != SYSTEM_SCREEN_COMPLETE_WITH_QRCODE)
-			{
-				setCurrentPage(SYSTEM_SCREEN_COMPLETE_WITH_QRCODE);
-				setQRCodeReceipt(gun_index);
-				DEBUG_INFO("Setting page to complete with receipt qr code.\n");
-			}
-			else
-			{
-				setQRCodeReceipt(gun_index);
-			}
+			// DISPLAY BY OCPP 2.0.1
 		}
 	}