Merge branch 'master' into DW30

EVSE/Modularization/logPackTools.c

@@ -243,6 +243,8 @@ int main(int argc, char *argv[]) {
 		hour = pst->tm_hour;
 		min = pst->tm_min;
 		sec = pst->tm_sec;
+		sprintf(cmd,"rm -f /mnt/%s-%s-*.zip \n",ModelName,SerialNo);
+		system(cmd);
 		if((argc == 3) && isdigit(*argv[2])){
 			cnt=atoi(argv[2]);
 		}

EVSE/Projects/define.h

@@ -315,7 +315,10 @@ struct SysConfigData
 	unsigned short			ChademoPlugInTimes;			//0~65535
 	unsigned char 			PsuAcInputType;				//0: 220, 1: 277
 	unsigned short 			RatingCurrent;				//0: Depend on Model name,	1 ~ rating value amp
-	unsigned char			QRCodeMadeMode;				//0: default	1:customized
+	unsigned char			isAPP;						//for AuthorisationMode=0; 0:false, 1:true
+	unsigned char			isQRCode;					//for AuthorisationMode=0; 0:false, 1:true
+	unsigned char			isRFID;						//for AuthorisationMode=0; 0:false, 1:true
+	unsigned char			QRCodeMadeMode;				//for isQRCode=1 ; 0: default	1:customized
 	unsigned char			QRCodeContent[128];			//for QRCodeMadeMode=1
 	/**************Charging***************/
 	unsigned short	   		MaxChargingEnergy;			//0: no limit,	1 ~ 65535	kWh