浏览代码

2021-09-30 / Eason Yang
Action:
1. Added: Define Enable & Disable for new qr code and new rfid icon.
2. Added: If the charger is on complete mode and then the system should not sleep.

File:
1. main.c
Action 2

2. lcmComm_dgus.h
Action 1

LCM Version: V0.19
Firmware Version: D0.55.XX.XXXX.XX

8009 3 年之前
父节点
当前提交
429d45c2c4

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

@@ -1371,9 +1371,9 @@ void setRfidIcon()
 	*/
 
 	if(ShmSysConfigAndInfo->SysConfig.isRFID == ON)
-		setDisplayValue(ICON_NEW_RFID, 0x02);
+		setDisplayValue(ICON_NEW_RFID, NEW_RFID_ENABLE);
 	else
-		setDisplayValue(ICON_NEW_RFID, 0x01);
+		setDisplayValue(ICON_NEW_RFID, NEW_RFID_DISABLE);
 
 }
 
@@ -1409,7 +1409,7 @@ void setQRCodeIcon()
 
 	if(ShmSysConfigAndInfo->SysConfig.isQRCode == ON)
 	{
-		setDisplayValue(ICON_NEW_QR_CODE,0x02);
+		setDisplayValue(ICON_NEW_QR_CODE,NEW_QRCODE_ENABLE);
 		if(ShmSysConfigAndInfo->SysConfig.QRCodeMadeMode == NO)
 		{
 			length = strlen((char *)ShmSysConfigAndInfo->SysConfig.SystemId);
@@ -1424,7 +1424,7 @@ void setQRCodeIcon()
 	else
 	{
 		setDisplayValue(TEXT_QRCODE_CONTENT, DISAPPEAR);
-		setDisplayValue(ICON_NEW_QR_CODE,0x01);
+		setDisplayValue(ICON_NEW_QR_CODE,NEW_QRCODE_DISABLE);
 	}
 }
 

+ 4 - 0
EVSE/Projects/AW-CCS/Apps/LCM/lcmComm_dgus.h

@@ -149,6 +149,10 @@
 #define QRCODE_BANDED						0x01
 #define QRCODE_ENABLE 						0x02
 #define QRCODE_DISABLE						0x03
+#define NEW_QRCODE_DISABLE					0x01
+#define NEW_QRCODE_ENABLE					0x02
+#define NEW_RFID_DISABLE					0x01
+#define NEW_RFID_ENABLE						0x02
 
 //=======================================
 // Icon variable address start from 1000

+ 2 - 1
EVSE/Projects/AW-CCS/Apps/main.c

@@ -4800,7 +4800,8 @@ int main(void)
 			   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_UPDATE) ||
 			   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_MAINTAIN) ||
 			   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_CHARGING) ||
-			   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_TERMINATING))
+			   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_TERMINATING) || 
+			   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].SystemStatus == SYS_MODE_COMPLETE))
 			{
 				ftime(&startTime[gun_index][TMR_IDX_POWERSAVING_LCD]);
 				ftime(&startTime[gun_index][TMR_IDX_POWERSAVING_RFID]);