[Improve][Modularization][Module_OcppBackend / Module_OcppBackendPH / Module_OcppBackend20]

2022.01.31 / Folus Wen

Actions:
1. Add ConnectorId to DataTransfer with message id ID_DisplayLcdPage.

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

@@ -13526,6 +13526,11 @@ int handleDataTransferRequest(char *uuid, char *payload)
 			{
 				strcpy((char*)ShmOCPP20Data->DataTransfer[0].Response_status, DataTransferStatusEnumTypeStr[DataTransferStatusEnumType_Accepted]);
 
+				if(json_object_object_get(data, "ConnectorId") != NULL)
+				{
+                                        ShmSysConfigAndInfo->SysConfig.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"));

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -10749,6 +10749,11 @@ int handleDataTransferRequest(char *uuid, char *payload)
 			{
 				json_object_object_add(response, "status", json_object_new_string("Accepted"));
 
+				if(json_object_object_get(data, "ConnectorId") != NULL)
+				{
+                                        ShmSysConfigAndInfo->SysConfig.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"));

EVSE/Modularization/ocppph/MessageHandler.c

@@ -10287,6 +10287,11 @@ int handleDataTransferRequest(char *uuid, char *payload)
 			{
 				json_object_object_add(response, "status", json_object_new_string("Accepted"));
 
+				if(json_object_object_get(data, "ConnectorId") != NULL)
+				{
+                                        ShmSysConfigAndInfo->SysConfig.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"));

EVSE/Projects/define.h

@@ -419,6 +419,7 @@ struct LED
 
 struct LCD_OVERRIDE
 {
+    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