2022-12-13/Jerry Wang

[OCPP 1.6]
Action:
1. Modify logic of packaging Dispenser log file in GetDiagnostics function.

File:
1. EVSE/Modularization/ocppfiles/MessageHandler.c
--> Action 1

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -12585,7 +12585,7 @@ void* GetDiagnosticsProcess(void* data)
 		sprintf(cmdBuf, "%s /Storage/OCPP/TransactionRelatedQueue", cmdBuf);
 		sprintf(cmdBuf, "%s /Storage/OCPP/QueueTransactionId", cmdBuf);
 		sprintf(cmdBuf, "%s /Storage/OCPP/OCPPConfiguration", cmdBuf);
-		sprintf(cmdBuf, "%s /Storage/Dispenser*Log.zip", cmdBuf);
+		sprintf(cmdBuf, "%s /Storage/*Dispenser*Log.zip", cmdBuf);
 		system(cmdBuf);
 
 		// Pack charging & event log
@@ -12767,7 +12767,7 @@ void* GetDiagnosticsProcess(void* data)
 
 end:
 	system("rm -f /mnt/*");
-	system("rm -f /Storage/Dispenser*Log.zip");
+	system("rm -f /Storage/*Dispenser*Log.zip");
 	sleep(5);
 	sprintf((char*)ShmOCPP16Data->DiagnosticsStatusNotification.Status, "%s", DiagnosticsStatusStr[DiagnosticsStatus_Idle]);
 	ShmOCPP16Data->SpMsg.bits.DiagnosticsStatusNotificationReq = 1;
@@ -16254,7 +16254,7 @@ void* GetLogProcess(void* data)
 
 		sprintf(cmdBuf, "%s /Storage/CCS*.zip", cmdBuf);
 		sprintf(cmdBuf, "%s /Storage/OCPP/*.db", cmdBuf);
-		sprintf(cmdBuf, "%s /Storage/Dispenser*Log.zip", cmdBuf);
+		sprintf(cmdBuf, "%s /Storage/*Dispenser*Log.zip", cmdBuf);
 		system(cmdBuf);
 
 		// Pack charging & event log
@@ -16444,7 +16444,7 @@ void* GetLogProcess(void* data)
 
 end:
 	system("rm -f /mnt/*");
-	system("rm -f /Storage/Dispenser*Log.zip");
+	system("rm -f /Storage/*Dispenser*Log.zip");
 	sleep(5);
 	ShmOCPP16Data->LogStatusNotification.requestId = ShmOCPP16Data->GetLog.requestId;
 	sprintf((char*)ShmOCPP16Data->LogStatusNotification.status, "%s", "Idle");