2020.03.04 / TC Hsu

Actions: Create DW30-DEBUG-rootfs build section, and modify DW30-rootfs section script in root Makefile, which for DW30 project DEBUG option in Project Config.h, it using "Project_Debug_Option" variable to decide "DEBUG" macro.

Files:
       modified:   EVSE/Projects/DW30/Apps/Config.h
       modified:   EVSE/Projects/DW30/Apps/Makefile
       modified:   Makefile

Image version    : N/A
Image checksum   : N/A

Hardware PWB P/N : N/A
Hardware Version : N/A

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

@@ -11,47 +11,47 @@ BuildFactorys: FactoryConfigBin
 BuildApps: MainTask EvCommTask EventLoggingTask InternalCommTask LcmControlTask PrimaryCommTask PsuCommTask ReadCmdlineTask FactoryConfigApp
 
 MainTask:
-	$(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) -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:
-	$(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
 
 EventLoggingTask:
-	$(CC) -D $(Project) -includeConfig.h -O0 -g3 -Wall -c -fmessage-length=0 -o Module_EventLogging.o Module_EventLogging.c
+	$(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:
-	$(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) -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:
-	$(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
 
 PrimaryCommTask:
-	$(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
 
 PsuCommTask:
-	$(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
 
 ReadCmdlineTask:
-	$(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
 
 FactoryConfigApp:
-	$(CC) -D $(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o FactoryConfig.o FactoryConfig.c
+	$(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) "-I../../" -o FactoryConfig "./FactoryConfig.c"
+	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
@@ -76,8 +76,12 @@ CopyExecuteFiles: OtherTools
 	cp -f ReadCmdline ../Images/root
 	cp -f FactoryConfig ../Images/root
 
-Clean:
+Clean: CleanObj CleanExecute
+
+CleanObj:
 	rm -f *.o
+
+CleanExecute:
 	rm -f main
 	rm -f Module_EvComm
 	rm -f Module_EventLogging

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