Browse Source

[Fix][Modularization][Module_OcppBackend]

2021.07.23 / Folus Wen

Actions:
1. DataTransafer code fix wrong statement.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 3 years ago
parent
commit
5e5c5b640d
1 changed files with 16 additions and 18 deletions
  1. 16 18
      EVSE/Modularization/ocpp20/MessageHandler.c

+ 16 - 18
EVSE/Modularization/ocpp20/MessageHandler.c

@@ -11989,7 +11989,9 @@ void createFirmwareVersionByDataTransfer(void)
 
 	sprintf((char*)ShmOCPP20Data->DataTransfer[0].vendorId, "%s", ShmSysConfigAndInfo->SysConfig.chargePointVendor);
 	sprintf((char*)ShmOCPP20Data->DataTransfer[0].messageId, "ID_FirmwareVersion");
-	sprintf((char*)ShmOCPP20Data->DataTransfer[0].data, json_object_to_json_string(FirmwareDataTransfer));
+	sprintf((char*)ShmOCPP20Data->DataTransfer[0].data, json_object_to_json_string_ext(FirmwareDataTransfer, JSON_C_TO_STRING_PLAIN));
+
+	json_object_put(FirmwareDataTransfer);
 }
 
 int handleDataTransferRequest(char *uuid, char *payload)
@@ -12059,13 +12061,14 @@ int handleDataTransferRequest(char *uuid, char *payload)
 			}
 			json_object_put(data);
 		}
-		else if(strstr(tempmessageId, "ID_ConfigQR") != NULL)
+		else if(strstr((char*)ShmOCPP20Data->DataTransfer[0].messageId, "ID_ConfigQR") != NULL)
 		{
 			json_object *data;
-			data = json_tokener_parse(tempdata);
+			data = json_tokener_parse((char*)ShmOCPP20Data->DataTransfer[0].data);
+
 			if(!is_error(data))
 			{
-				json_object_object_add(response, "status", json_object_new_string("Accepted"));
+				strcpy((char*)ShmOCPP20Data->DataTransfer[0].Response_status, DataTransferStatusEnumTypeStr[DataTransferStatusEnumType_Accepted]);
 
 				if(json_object_object_get(data, "Content_Type") != NULL)
 				{
@@ -12079,28 +12082,26 @@ int handleDataTransferRequest(char *uuid, char *payload)
 						}
 					}
 					else
-						json_object_object_add(response, "status", json_object_new_string("Rejected"));
+						strcpy((char*)ShmOCPP20Data->DataTransfer[0].Response_status, DataTransferStatusEnumTypeStr[DataTransferStatusEnumType_Rejected]);
 				}
 
 				StoreUsrConfigData(&ShmSysConfigAndInfo->SysConfig);
 			}
 			else
 			{
-				json_object_object_add(response, "status", json_object_new_string("Rejected"));
-				json_object_object_add(response, "data", json_object_new_string("Configuration content something wrong."));
+				strcpy((char*)ShmOCPP20Data->DataTransfer[0].Response_status, DataTransferStatusEnumTypeStr[DataTransferStatusEnumType_Rejected]);
+				strcpy((char*)ShmOCPP20Data->DataTransfer[0].Response_data, "Configuration content something wrong.");
 			}
 			json_object_put(data);
-
-			sprintf(message,"[%d,\"%s\",%s]",MESSAGE_TYPE_CALLRESULT, uuid, json_object_to_json_string_ext(response, JSON_C_TO_STRING_PLAIN));
-			json_object_put(response);
 		}
-		else if(strstr(tempmessageId, "ID_DsiplayLcdPage") != NULL)
+		else if(strstr((char*)ShmOCPP20Data->DataTransfer[0].messageId, "ID_DsiplayLcdPage") != NULL)
 		{
 			json_object *data;
-			data = json_tokener_parse(tempdata);
+			data = json_tokener_parse((char*)ShmOCPP20Data->DataTransfer[0].data);
+
 			if(!is_error(data))
 			{
-				json_object_object_add(response, "status", json_object_new_string("Accepted"));
+				strcpy((char*)ShmOCPP20Data->DataTransfer[0].Response_status, DataTransferStatusEnumTypeStr[DataTransferStatusEnumType_Accepted]);
 
 				if(json_object_object_get(data, "Page_Index") != NULL)
 				{
@@ -12116,13 +12117,10 @@ int handleDataTransferRequest(char *uuid, char *payload)
 			}
 			else
 			{
-				json_object_object_add(response, "status", json_object_new_string("Rejected"));
-				json_object_object_add(response, "data", json_object_new_string("Configuration content something wrong."));
+				strcpy((char*)ShmOCPP20Data->DataTransfer[0].Response_status, DataTransferStatusEnumTypeStr[DataTransferStatusEnumType_Rejected]);
+				strcpy((char*)ShmOCPP20Data->DataTransfer[0].Response_data, "Configuration content something wrong.");
 			}
 			json_object_put(data);
-
-			sprintf(message,"[%d,\"%s\",%s]",MESSAGE_TYPE_CALLRESULT, uuid, json_object_to_json_string_ext(response, JSON_C_TO_STRING_PLAIN));
-			json_object_put(response);
 		}
 		else
 		{