Merge branch 'DS60-120' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x into DS60-120

EVSE/Modularization/.gitignore

@@ -0,0 +1,8 @@
+*.o
+*.a
+Module_Wifi
+Module_4g
+WebService
+logPackTools
+OcppBackend
+Module_ProduceUtils

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/DW30/Apps/.gitignore

@@ -0,0 +1,2 @@
+*.o
+

EVSE/Projects/DW30/Apps/Config.h

@@ -10,7 +10,16 @@
 typedef unsigned char			byte;
 
 #define TOTAL_QUANTITY_GUN			4				//Max Count
-#define DEBUG						0
+
+#ifdef DEBUG_OPTION
+    #if (DEBUG_OPTION == 1)
+        #define DEBUG               1
+    #else
+        #define DEBUG               0
+    #endif
+#else
+    #define DEBUG                   0
+#endif
 
 #define MODE_BOOT					0
 #define MODE_IDLE					1

EVSE/Projects/DW30/Apps/Makefile

@@ -3,92 +3,91 @@ export PATH=/bin:/sbin:/usr/bin:$(SDK_PATH_TARGET)/usr/bin:$PATH
 
 #define library variable
 Internal485ProtocolLib = -L ../../../Modularization/Internal485Protocol -lInternal485Protocol
-#PsuCommProtocolLib = -L ../../../Modularization/PsuCommProtocol -lPsuCommProtocol
 
-all: CopyFile apps
-#apps: Module_CSU Module_EvComm Module_EventLogging Module_InternalComm Module_LcmControl Module_PrimaryComm Module_PsuComm 
-# ReadCmdline kill.sh
-apps: MainTask EvCommTask EventLoggingTask InternalCommTask LcmControlTask PrimaryCommTask PsuCommTask ReadCmdlineTask WebService 4GTask FactoryConfigApp OtherTools
+all: CreateOutputFolder BuildFactorys BuildApps CopyExecuteFiles Clean
+
+BuildFactorys: FactoryConfigBin
+
+BuildApps: MainTask EvCommTask EventLoggingTask InternalCommTask LcmControlTask PrimaryCommTask PsuCommTask ReadCmdlineTask FactoryConfigApp
 
 MainTask:
-	rm -f *.o
-	rm -f main;
-	$(CC) -D $(Project) -include../../../Modularization/Module_RFID.h -O0 -g3 -Wall -c -fmessage-length=0 -o main.o main.c
-	$(CC) -D $(Project) -include../../../Modularization/Module_RFID.h -O0 -g3 -Wall -c -fmessage-length=0 -o timeout.o timeout.c
-	$(CC) -o main main.o timeout.o ../../../Modularization/libModule_RFID.a ../../../Modularization/libModule_Upgrade.a	
-	cp -f main ../Images/root
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -include../../../Modularization/Module_RFID.h -O0 -g3 -Wall -c -fmessage-length=0 -o main.o main.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -include../../../Modularization/Module_RFID.h -O0 -g3 -Wall -c -fmessage-length=0 -o timeout.o timeout.c
+	$(CC) -o main main.o timeout.o ../../../Modularization/libModule_RFID.a ../../../Modularization/libModule_Upgrade.a
 
 EvCommTask:
-	rm -f Module_EvComm;
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Ev_Comm.o Ev_Comm.c
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_EvComm.o Module_EvComm.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Ev_Comm.o Ev_Comm.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_EvComm.o Module_EvComm.c
 	$(CC) -o Module_EvComm Ev_Comm.o Module_EvComm.o
-	cp -f Module_EvComm ../Images/root	
-	
+
 EventLoggingTask:
-	rm -f Module_EventLogging;
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_EventLogging.o Module_EventLogging.c
-	$(CC) -o Module_EventLogging Module_EventLogging.o 	
-	cp -f Module_EventLogging ../Images/root	
-	
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_EventLogging.o Module_EventLogging.c
+	$(CC) -o Module_EventLogging Module_EventLogging.o
+
 InternalCommTask:
-	rm -f Module_InternalComm; 
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o internalComm.o internalComm.c
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_InternalComm.o Module_InternalComm.c
-	$(CC) -o Module_InternalComm Module_InternalComm.o internalComm.o 	
-	cp -f Module_InternalComm ../Images/root
-	
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o internalComm.o internalComm.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_InternalComm.o Module_InternalComm.c
+	$(CC) -o Module_InternalComm Module_InternalComm.o internalComm.o
+
 LcmControlTask:
-	rm -f Module_LcmControl; 
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_LcmControl.o Module_LcmControl.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_LcmControl.o Module_LcmControl.c
 	$(CC) -o Module_LcmControl Module_LcmControl.o
-	cp -f Module_LcmControl ../Images/root			
 
 PrimaryCommTask:
-	rm -f Module_PrimaryComm; 
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_PrimaryComm.o Module_PrimaryComm.c
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o PrimaryComm.o PrimaryComm.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_PrimaryComm.o Module_PrimaryComm.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o PrimaryComm.o PrimaryComm.c
 	$(CC) -o Module_PrimaryComm Module_PrimaryComm.o PrimaryComm.o
-	cp -f Module_PrimaryComm ../Images/root	
 
 PsuCommTask:
-	rm -f Module_PsuComm; 
-	$(CC) -D $(Project) -include../../../Modularization/Infypwr_PsuCommObj.h -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_PsuComm.o Module_PsuComm.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -include../../../Modularization/Infypwr_PsuCommObj.h -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_PsuComm.o Module_PsuComm.c
 	$(CC) -o Module_PsuComm Module_PsuComm.o ../../../Modularization/libInfypwr_PsuCommObj.a
-	cp -f Module_PsuComm ../Images/root	
-	
+
 ReadCmdlineTask:
-	rm -f ReadCmdline; 
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o ReadCmdline.o ReadCmdline.c
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o ReadCmdline.o ReadCmdline.c
 	$(CC) -o ReadCmdline ReadCmdline.o
-	cp -f ReadCmdline ../Images/root
 
 FactoryConfigApp:
-	@echo "===== Module_FactoryConfig_Task =================================="
-	rm -f FactoryConfig
-	gcc -D $(Project) "-I../../" -o FactoryConfig "./FactoryConfig.c"
-	mkdir -p /Storage/SystemLog	
+	$(CC) -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) -O0 -g3 -Wall -c -fmessage-length=0 -o FactoryConfig.o FactoryConfig.c
+	$(CC) -o FactoryConfig FactoryConfig.o
+
+FactoryConfigBin:
+	gcc -D $(Project) -D DEBUG_OPTION=$(Project_Debug_Option) "-I../../" -o FactoryConfig "./FactoryConfig.c"
+	mkdir -p /Storage/SystemLog
 	./FactoryConfig -f;true
 	cp /mnt/FactoryDefaultConfig.bin ../Images
-	rm -f FactoryConfig; 
-	$(CC) -D $(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o FactoryConfig.o FactoryConfig.c 
-	$(CC) -o FactoryConfig FactoryConfig.o 
-	cp -f FactoryConfig ../Images/root
-
-WebService:
-	cp -f ../../../Modularization/WebService ../Images/root
-
-4GTask:
-	cp -f ../../../Modularization/Module_4g ../Images/root
+	rm -f FactoryConfig
 
 OtherTools:
 	cp -f init.sh ../Images/root
 	cp -f kill.sh ../Images/root
 
-CopyFile: 
+CreateOutputFolder: 
 	rm -rfv ../Images/root
 	mkdir -p ../Images/root
 
+CopyExecuteFiles: OtherTools
+	cp -f main ../Images/root
+	cp -f Module_EvComm ../Images/root
+	cp -f Module_EventLogging ../Images/root
+	cp -f Module_InternalComm ../Images/root
+	cp -f Module_LcmControl ../Images/root
+	cp -f Module_PrimaryComm ../Images/root
+	cp -f Module_PsuComm ../Images/root
+	cp -f ReadCmdline ../Images/root
+	cp -f FactoryConfig ../Images/root
 
+Clean: CleanObj CleanExecute
 
-	
+CleanObj:
+	rm -f *.o
+
+CleanExecute:
+	rm -f main
+	rm -f Module_EvComm
+	rm -f Module_EventLogging
+	rm -f Module_InternalComm
+	rm -f Module_LcmControl
+	rm -f Module_PrimaryComm
+	rm -f Module_PsuComm
+	rm -f ReadCmdline
+	rm -f FactoryConfig

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

EVSE/rootfs/root/.gitignore

@@ -0,0 +1,6 @@
+Module_Wifi
+Module_4g
+WebService
+logPackTools
+OcppBackend
+Module_ProduceUtils

Makefile

@@ -338,7 +338,7 @@ DW30-rootfs:
 	@echo =================================
 #	@cd EVSE/GPL;make all
 	@cd EVSE/Modularization;make Project=DW30 all
-	@cd EVSE/Projects/DW30/Apps;make Project=DW30 all
+	@cd EVSE/Projects/DW30/Apps;make Project=DW30 Project_Debug_Option=0 all
 	@rm -f EVSE/Projects/DW30/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
 	@mke2fs -vm0 /dev/ram0 131072
@@ -360,7 +360,35 @@ DW30-rootfs:
 	@gzip -v9 EVSE/Projects/DW30/Images/ramdisk
 	@rm -rfv EVSE/Projects/DW30/Images/root
 	@rm -rfv EVSE/Projects/DW30/Images/mnt
-		
+
+DW30-DEBUG-rootfs:
+	@echo =================================
+	@echo     Building DW30 debug rootfs
+	@echo =================================
+	@cd EVSE/Modularization;make Project=DW30 all
+	@cd EVSE/Projects/DW30/Apps;make Project=DW30 Project_Debug_Option=1 all
+	@rm -f EVSE/Projects/DW30/Images/ramdisk.gz
+	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
+	@mke2fs -vm0 /dev/ram0 131072
+	@tune2fs -c 0 /dev/ram0
+	@dd if=/dev/ram0 bs=1k count=131072 | gzip -v9 > EVSE/Projects/DW30/Images/ramdisk.gz
+	@mkdir -p EVSE/Projects/DW30/Images/mnt
+	@gunzip EVSE/Projects/DW30/Images/ramdisk.gz
+	@sync
+	@mount -o loop EVSE/Projects/DW30/Images/ramdisk EVSE/Projects/DW30/Images/mnt
+	@cp -rfv EVSE/rootfs/* EVSE/Projects/DW30/Images/mnt/
+	@cp -rfv EVSE/Projects/DW30/Images/root/* EVSE/Projects/DW30/Images/mnt/root
+	@chown www-data:www-data EVSE/Projects/DW30/Images/mnt/var/www -R
+	@chmod 777 EVSE/Projects/DW30/Images/mnt/var/log -R
+	@chmod 777 EVSE/Projects/DW30/Images/mnt/var/run -R
+	@sync
+	@sleep 3
+	@umount EVSE/Projects/DW30/Images/mnt
+	@sync
+	@gzip -v9 EVSE/Projects/DW30/Images/ramdisk
+	@rm -rfv EVSE/Projects/DW30/Images/root
+	@rm -rfv EVSE/Projects/DW30/Images/mnt
+
 DW30-all: DW30-uboot DW30-linux DW30-rootfs
 
 DS60-120-uboot-default: u-boot_clean u-boot