Merge branch 'AW-CCS' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x into AW-CCS

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

@@ -71,6 +71,7 @@ void setEthernetIcon();
 void setAlarmCodeAndIcon();
 void setBillingFromWebsite();
 void setQRCodeReceipt(uint8_t gun_index);
+void setReceiptIcon(uint8_t gun_index);
 
 //=======================================
 // Declare Timer
@@ -423,19 +424,7 @@ void page_complete(uint8_t gun_index, uint8_t system_mode)
 		setPresentChargedEnergy(gun_index);
 		setPresentChargedDuration(gun_index);
 		setBatteryAnimation(gun_index, system_mode);
-
-		// DISPLAY FOR QR CODE RECEIPT
-		if(strstr((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL, "phihong"))
-		{
-			setDisplayValue(ICON_THE_CHARGE_COMPLETE, DISAPPEAR);
-			setDisplayValue(ICON_CONNECTION_COMPLETE, DISAPPEAR);
-			setQRCodeReceipt(gun_index);
-		}
-		else
-		{
-			setDisplayValue(ICON_THE_CHARGE_COMPLETE, APPEAR);
-			setDisplayValue(ICON_CONNECTION_COMPLETE, APPEAR);
-		}
+		setReceiptIcon(gun_index);
 
 		// SHOW FINAL COST AND ACCOUNT BALANCE AFTER THE END OF TRANSACTION
 		if((ShmSysConfigAndInfo->SysInfo.OcppConnStatus == ON))
@@ -491,6 +480,7 @@ void page_terminating(uint8_t gun_index, uint8_t system_mode)
 		setPresentChargedDuration(gun_index);
 		setPresentChargedEnergy(gun_index);
 		setPresentChargingPower(gun_index);
+		setReceiptIcon(gun_index);
 
 		if((ShmSysConfigAndInfo->SysInfo.OcppConnStatus == ON))
 		{
@@ -1440,7 +1430,7 @@ void setQRCodeReceipt(uint8_t gun_index)
 	sprintf((char *)QRCodeReceipt, "%s%d", QRCodeContent,TransactionId);
 	string2ByteArray(QRCodeReceipt, data);
 
-	if(ShmSysConfigAndInfo->SysInfo.OcppConnStatus == ON)
+	if(strstr((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL, "phihong") && (ShmSysConfigAndInfo->SysInfo.OcppConnStatus == ON))
 	{
 		length = strlen((char *)data);
 		setQRcodeContent((char *)data, length, QRCODE_FOR_COMPLETE);
@@ -2088,6 +2078,26 @@ void setDefaultValue(uint8_t gun_index, uint8_t system_mode)
 	}
 }
 
+//=======================================
+// Setting receipt icon
+//=======================================
+void setReceiptIcon(uint8_t gun_index)
+{
+	// DISPLAY FOR QR CODE RECEIPT
+	if(strstr((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL, "phihong") && (ShmSysConfigAndInfo->SysInfo.OcppConnStatus == ON))
+	{
+		setDisplayValue(ICON_THE_CHARGE_COMPLETE, DISAPPEAR);
+		setDisplayValue(ICON_CONNECTION_COMPLETE, APPEAR);
+		setQRCodeReceipt(gun_index);
+	}
+	else
+	{
+		setDisplayValue(ICON_THE_CHARGE_COMPLETE, APPEAR);
+		setDisplayValue(ICON_CONNECTION_COMPLETE, APPEAR);
+		setQRCodeReceipt(gun_index);
+	}
+}
+
 //=======================================
 // Initial all share memory
 //=======================================