Merge branch 'master' into AW-CCS

EVSE/Modularization/WebService.c

@@ -1532,6 +1532,24 @@ int main(int argc, char *argv[]) {
 	if(strcmp(argv[1], "log") == 0)
 	{
 		char cmd[512];
+		char *IsDO[3];
+		uint16_t Heartbeat=0;
+		substr((char *)IsDO,(const char *)ShmSysConfigAndInfo->SysConfig.ModelName,0,2);
+		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0 || strcmp(IsDO, "DB") == 0 || strcmp(IsDO, "DL") == 0){
+			ShmSysConfigAndInfo->SysInfo.isDispenserLog=1;
+			for(;;){
+				if(ShmSysConfigAndInfo->SysInfo.isDispenserLog==0){
+					break;
+				}
+				if(Heartbeat==0xb4){
+					break;
+				}
+				else{
+					Heartbeat++;
+					sleep(1);
+				}
+			}
+		}
 
 		if((argc == 3) && isdigit(*argv[2]))
 		{

EVSE/Projects/define.h

@@ -1211,6 +1211,7 @@ struct SysInfoData
     struct BAZEL8           bazel8;                     // Bazel8 payment used
     struct Enegate          enegate;                    // Enegate payment used
     unsigned char           PsuLostQuantity;
+    unsigned char			isDispenserLog;				// 0: off	1: on
 };
 
 struct SysConfigAndInfo