2022-02-01 / Wendell

Actions
1. create LCD_NOUSE to replace original LCD_OVERRIDE
2. move new LCD_OVERRIDE to SysInfoData

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/ocpp20/MessageHandler.c

@@ -13528,20 +13528,20 @@ int handleDataTransferRequest(char *uuid, char *payload)
 
 				if(json_object_object_get(data, "ConnectorId") != NULL)
 				{
-                                        ShmSysConfigAndInfo->SysConfig.LcdOveride.connectorId = json_object_get_int(json_object_object_get(data, "ConnectorId"));
+                                        ShmSysConfigAndInfo->SysInfo.LcdOveride.connectorId = json_object_get_int(json_object_object_get(data, "ConnectorId"));
 				}
 
 				if(json_object_object_get(data, "Page_Index") != NULL)
 				{
-					ShmSysConfigAndInfo->SysConfig.LcdOveride.page_index = json_object_get_int(json_object_object_get(data, "Page_Index"));
+					ShmSysConfigAndInfo->SysInfo.LcdOveride.page_index = json_object_get_int(json_object_object_get(data, "Page_Index"));
 				}
 
 				if(json_object_object_get(data, "Duration") != NULL)
 				{
-					ShmSysConfigAndInfo->SysConfig.LcdOveride.duration = json_object_get_int(json_object_object_get(data, "Duration"));
+					ShmSysConfigAndInfo->SysInfo.LcdOveride.duration = json_object_get_int(json_object_object_get(data, "Duration"));
 				}
 
-				ShmSysConfigAndInfo->SysConfig.LcdOveride.isOverideReq = ON;
+				ShmSysConfigAndInfo->SysInfo.LcdOveride.isOverideReq = ON;
 			}
 			else
 			{

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -10751,20 +10751,20 @@ int handleDataTransferRequest(char *uuid, char *payload)
 
 				if(json_object_object_get(data, "ConnectorId") != NULL)
 				{
-                                        ShmSysConfigAndInfo->SysConfig.LcdOveride.connectorId = json_object_get_int(json_object_object_get(data, "ConnectorId"));
+                                        ShmSysConfigAndInfo->SysInfo.LcdOveride.connectorId = json_object_get_int(json_object_object_get(data, "ConnectorId"));
 				}
 
 				if(json_object_object_get(data, "Page_Index") != NULL)
 				{
-					ShmSysConfigAndInfo->SysConfig.LcdOveride.page_index = json_object_get_int(json_object_object_get(data, "Page_Index"));
+					ShmSysConfigAndInfo->SysInfo.LcdOveride.page_index = json_object_get_int(json_object_object_get(data, "Page_Index"));
 				}
 
 				if(json_object_object_get(data, "Duration") != NULL)
 				{
-					ShmSysConfigAndInfo->SysConfig.LcdOveride.duration = json_object_get_int(json_object_object_get(data, "Duration"));
+					ShmSysConfigAndInfo->SysInfo.LcdOveride.duration = json_object_get_int(json_object_object_get(data, "Duration"));
 				}
 
-				ShmSysConfigAndInfo->SysConfig.LcdOveride.isOverideReq = 1;
+				ShmSysConfigAndInfo->SysInfo.LcdOveride.isOverideReq = 1;
 			}
 			else
 			{

EVSE/Modularization/ocppph/MessageHandler.c

@@ -10289,20 +10289,20 @@ int handleDataTransferRequest(char *uuid, char *payload)
 
 				if(json_object_object_get(data, "ConnectorId") != NULL)
 				{
-                                        ShmSysConfigAndInfo->SysConfig.LcdOveride.connectorId = json_object_get_int(json_object_object_get(data, "ConnectorId"));
+                                        ShmSysConfigAndInfo->SysInfo.LcdOveride.connectorId = json_object_get_int(json_object_object_get(data, "ConnectorId"));
 				}
 
 				if(json_object_object_get(data, "Page_Index") != NULL)
 				{
-					ShmSysConfigAndInfo->SysConfig.LcdOveride.page_index = json_object_get_int(json_object_object_get(data, "Page_Index"));
+					ShmSysConfigAndInfo->SysInfo.LcdOveride.page_index = json_object_get_int(json_object_object_get(data, "Page_Index"));
 				}
 
 				if(json_object_object_get(data, "Duration") != NULL)
 				{
-					ShmSysConfigAndInfo->SysConfig.LcdOveride.duration = json_object_get_int(json_object_object_get(data, "Duration"));
+					ShmSysConfigAndInfo->SysInfo.LcdOveride.duration = json_object_get_int(json_object_object_get(data, "Duration"));
 				}
 
-				ShmSysConfigAndInfo->SysConfig.LcdOveride.isOverideReq = 1;
+				ShmSysConfigAndInfo->SysInfo.LcdOveride.isOverideReq = 1;
 			}
 			else
 			{

EVSE/Projects/define.h

@@ -417,9 +417,16 @@ struct LED
 	unsigned char			Blue[3];					// Blue color	0~100, element 0: IDLE		1: CHARGING		2: FAULT
 };
 
+struct LCD_NOUSE
+{
+    unsigned char           page_index;                 // LCD override page index
+    unsigned char           duration;                   // LCD override duration
+    unsigned char           isOverideReq:1;             // LCD override request
+};
+
 struct LCD_OVERRIDE
 {
-    unsigned char           connectorId;		// LCD override connector id
+    unsigned char           connectorId;                // LCD override connector id
     unsigned char           page_index;                 // LCD override page index
     unsigned char           duration;                   // LCD override duration
     unsigned char           isOverideReq:1;             // LCD override request
@@ -565,7 +572,7 @@ struct SysConfigData
 	unsigned char           isReqFirstUpgrade;          //EVSE is request first upgrade from PH server
 	unsigned char           isEnableLocalPowerSharging; //0: Disable power sharing  1: Enable power sharing
 	unsigned char           StopChargingByButton;       //0: Disable  1: Enable
-    struct LCD_OVERRIDE     LcdOveride;                 // LCD override info
+    struct LCD_NOUSE        Legacy_LcdOveride;          // LCD override info (no use anymore)
     struct TTIA             TTIA_Info;                  // TTIA configuration struct
 
     /************PowerCabinet************/
@@ -982,6 +989,7 @@ struct SysInfoData
     DC_Meter_Info DcMeterInfo[4];
     unsigned char           OTPTemp;                    // OTP Temperature
     unsigned char           OTPTempR;                   // OTP Recovery Temperature
+    struct LCD_OVERRIDE     LcdOveride;                 // LCD override info (no use anymore)
 };
 
 struct SysConfigAndInfo
@@ -4572,10 +4580,10 @@ struct StructWeatherInfo
 
 struct StructCreditDeductResult
 {
-	int txId;
-	unsigned char creditNo[64];
-	unsigned char deductResult:1;
-	unsigned char isDonateInvoice:1;
+    int txId;
+    unsigned char creditNo[64];
+    unsigned char deductResult:1;
+    unsigned char isDonateInvoice:1;
 };
 
 struct StructTcciCustomData