2020.02.19 / Folus Wen

Actions:
1. define.h add MACRO NAME for separate each project definination.
2. Makefile add project name to make arguments.(Only AW-Regular, other project please follow)
3. run_gen_make_script.sh add project name to make arguments.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/Makefile

@@ -18,37 +18,37 @@ clean:
 
 Module_ProduceUtils:
 	rm -f Module_ProduceUtils
-	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -I ../Projects -o Module_ProduceUtils.o Module_ProduceUtils.c
+	$(CC) -D Project=$(Project) -O0 -g3 -Wall -c -fmessage-length=0 -I ../Projects -o Module_ProduceUtils.o Module_ProduceUtils.c
 	$(CC) -o Module_ProduceUtils Module_ProduceUtils.o
 	rm -f Module_ProduceUtils.o
 	cp -f Module_ProduceUtils ../rootfs/root
 
 Module_RFIDLib:
 	rm -f libModule_RFID.a
-	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_RFID.o Module_RFID.c
+	$(CC) -D Project=$(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_RFID.o Module_RFID.c
 	$(AR) -r libModule_RFID.a Module_RFID.o
 	rm -f Module_RFID.o
 
 Module_Wifi:
 	rm -f Module_Wifi
-	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_Wifi.o Module_Wifi.c
+	$(CC) -D Project=$(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_Wifi.o Module_Wifi.c
 	$(CC) -o Module_Wifi Module_Wifi.o
 	rm -f Module_Wifi.o
 	cp -f Module_Wifi ../rootfs/root
 
 Module_4g:
 	rm -f Module_4g
-	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_4g.o Module_4g.c
+	$(CC) -D Project=$(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_4g.o Module_4g.c
 	$(CC) -o Module_4g Module_4g.o
 	rm -f Module_4g.o
 	cp -f Module_4g ../rootfs/root
 
 WebServiceLib:
 	rm -f WebService
-	$(CC) -I ../GPL/json-c-json-c-0.13.1-20180305/release/include/json-c -I ../Projects -O0 -g3 -Wall -c -fmessage-length=0 -o WebService.o -ljson-c -w WebService.c
+	$(CC) -D Project=$(Project) -I ../GPL/json-c-json-c-0.13.1-20180305/release/include/json-c -I ../Projects -O0 -g3 -Wall -c -fmessage-length=0 -o WebService.o -ljson-c -w WebService.c
 	$(CC) -L ../GPL/json-c-json-c-0.13.1-20180305/release/lib -o WebService WebService.o -ljson-c
 	rm -f WebService.o
-	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -o logPackTools.o logPackTools.c
+	$(CC) -D Project=$(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o logPackTools.o logPackTools.c
 	$(CC) -o logPackTools logPackTools.o
 	rm -f logPackTools.o
 	cp -f WebService ../rootfs/root/
@@ -56,24 +56,24 @@ WebServiceLib:
 
 OcppBackend:
 	rm -f OcppBackend; 
-	$(CC) ./ocppfiles/Module_OcppBackend.c ./ocppfiles/MessageHandler.c ./ocppfiles/JsonParser.c ./ocppfiles/SystemLogMessage.c ./ocppfiles/hashmap.c -I ../Projects -I ../GPL/libwebsockets-v2.1-stable/release/include -L ../GPL/libwebsockets-v2.1-stable/release/lib -L ../GPL/openssl-1.0.2g/release/lib -lwebsockets -lsqlite3 -lpthread -lc -o OcppBackend
+	$(CC) -D Project=$(Project) ./ocppfiles/Module_OcppBackend.c ./ocppfiles/MessageHandler.c ./ocppfiles/JsonParser.c ./ocppfiles/SystemLogMessage.c ./ocppfiles/hashmap.c -I ../Projects -I ../GPL/libwebsockets-v2.1-stable/release/include -L ../GPL/libwebsockets-v2.1-stable/release/lib -L ../GPL/openssl-1.0.2g/release/lib -lwebsockets -lsqlite3 -lpthread -lc -o OcppBackend
 	cp -f OcppBackend ../rootfs/root/
 
 Phihong_PsuCommObj:
 	rm -f libPhihong_PsuCommObj.a
-	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -o Phihong_PsuCommObj.o Phihong_PsuCommObj.c
+	$(CC) -D Project=$(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o Phihong_PsuCommObj.o Phihong_PsuCommObj.c
 	$(AR) -r libPhihong_PsuCommObj.a Phihong_PsuCommObj.o
 	rm -f Phihong_PsuCommObj.o
 
 Infypwr_PsuCommObj:
 	rm -f libInfypwr_PsuCommObj.a
-	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -o Infypwr_PsuCommObj.o Infypwr_PsuCommObj.c
+	$(CC) -D Project=$(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o Infypwr_PsuCommObj.o Infypwr_PsuCommObj.c
 	$(AR) -r libInfypwr_PsuCommObj.a Infypwr_PsuCommObj.o
 	rm -f Infypwr_PsuCommObj.o
 
 Module_UpgradeLib:
 	rm -f libModule_Upgrade.a
-	$(CC) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_Upgrade.o Module_Upgrade.c
+	$(CC) -D Project=$(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_Upgrade.o Module_Upgrade.c
 	$(AR) -r libModule_Upgrade.a Module_Upgrade.o
 	rm -f Module_Upgrade.o
 

EVSE/Projects/AW-Regular/Apps/Makefile

@@ -13,7 +13,7 @@ apps: Module_InternalComm_Task Module_FactoryConfig_Task Module_EventLogging_Tas
 Module_InternalComm_Task:
 	@echo "===== Module_InternalComm_Task ==================================="
 	rm -f Module_InternalComm 
-	$(CC) "-I../../" "-include../../../Modularization/Module_Upgrade.h" -O0 -g3 -Wall -c -fmessage-length=0 -o Module_InternalComm.o "./Module_InternalComm.c"
+	$(CC) -D Project=$(Project) "-I../../" "-include../../../Modularization/Module_Upgrade.h" -O0 -g3 -Wall -c -fmessage-length=0 -o Module_InternalComm.o "./Module_InternalComm.c"
 	$(CC) -o Module_InternalComm Module_InternalComm.o ${Lib_Module_Upgrade}
 	rm -f *.o
 	mv -f Module_InternalComm ../Images/root
@@ -22,12 +22,12 @@ Module_InternalComm_Task:
 Module_FactoryConfig_Task:
 	@echo "===== Module_FactoryConfig_Task =================================="
 	rm -f Module_FactoryConfig
-	gcc "-I../../" -o Module_FactoryConfig "./Module_FactoryConfig.c"
+	gcc -D Project=$(Project) "-I../../" -o Module_FactoryConfig "./Module_FactoryConfig.c"
 	mkdir -p /Storage/SystemLog	
 	./Module_FactoryConfig -f;true
 	cp /mnt/FactoryDefaultConfig.bin ../Images 
 	rm -f Module_FactoryConfig 
-	$(CC) "-I../../" -O0 -g3 -Wall -c -fmessage-length=0 -o Module_FactoryConfig.o "./Module_FactoryConfig.c"
+	$(CC) -D Project=$(Project) "-I../../" -O0 -g3 -Wall -c -fmessage-length=0 -o Module_FactoryConfig.o "./Module_FactoryConfig.c"
 	$(CC) -o Module_FactoryConfig Module_FactoryConfig.o 
 	rm -f *.o
 	mv -f Module_FactoryConfig ../Images/root
@@ -36,7 +36,7 @@ Module_FactoryConfig_Task:
 Module_EventLogging_Task:
 	@echo "===== Module_EventLogging_Task ==================================="
 	rm -f Module_EventLogging 
-	$(CC) "-I../../" -O0 -g3 -Wall -c -fmessage-length=0 -o Module_EventLogging.o "./Module_EventLogging.c"
+	$(CC) -D Project=$(Project) "-I../../" -O0 -g3 -Wall -c -fmessage-length=0 -o Module_EventLogging.o "./Module_EventLogging.c"
 	$(CC) -o Module_EventLogging Module_EventLogging.o 
 	rm -f *.o
 	mv -f Module_EventLogging ../Images/root
@@ -45,7 +45,7 @@ Module_EventLogging_Task:
 Module_AlarmDetect_Task:
 	@echo "===== Module_AlarmDetect_Task ===================================="
 	rm -f Module_AlarmDetect 
-	$(CC) "-I../../" -O0 -g3 -Wall -c -fmessage-length=0 -o Module_AlarmDetect.o "./Module_AlarmDetect.c"
+	$(CC) -D Project=$(Project) "-I../../" -O0 -g3 -Wall -c -fmessage-length=0 -o Module_AlarmDetect.o "./Module_AlarmDetect.c"
 	$(CC) -o Module_AlarmDetect Module_AlarmDetect.o 
 	rm -f *.o
 	mv -f Module_AlarmDetect ../Images/root	
@@ -54,7 +54,7 @@ Module_AlarmDetect_Task:
 Module_CSU_Task:
 	@echo "===== Module_CSU_Task ============================================"
 	rm -f main 
-	$(CC) "-I../../" "-include../../../Modularization/ocppfiles/sqlite3.h" "-include../../../Modularization/Module_Upgrade.h" "-include../../../Modularization/Module_RFID.h" -O0 -g3 -Wall -c -fmessage-length=0 -o main.o "./main.c"
+	$(CC) -D Project=$(Project) "-I../../" "-include../../../Modularization/ocppfiles/sqlite3.h" "-include../../../Modularization/Module_Upgrade.h" "-include../../../Modularization/Module_RFID.h" -O0 -g3 -Wall -c -fmessage-length=0 -o main.o "./main.c"
 	$(CC) -o main main.o ${Lib_Module_RFID} ${Lib_Module_Upgrade} ${Lib_SQLite3}
 	rm -f *.o
 	mv -f main ../Images/root		
@@ -63,7 +63,7 @@ Module_CSU_Task:
 Module_Speaker_Task:
 	@echo "===== Module_Speaker_Task ===================================="
 	rm -f Module_Speaker
-	$(CC) "-I../../"  -O0 -g3 -Wall -c -fmessage-length=0 -o Module_Speaker.o  "./Module_Speaker.c"
+	$(CC) -D Project=$(Project) "-I../../"  -O0 -g3 -Wall -c -fmessage-length=0 -o Module_Speaker.o  "./Module_Speaker.c"
 	$(CC) -o Module_Speaker Module_Speaker.o 
 	rm -f *.o
 	mv -f Module_Speaker ../Images/root	

EVSE/Projects/define.h

@@ -36,13 +36,64 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
 #define RATED_CURRENT		350		//Amp, it depend on the capacity of charging connector
 
 /*relevant to Quantity */
-#define MAX_PSU_QUANTITY	62
-#define CHAdeMO_QUANTITY	1
-#define CCS_QUANTITY		1
-#define GB_QUANTITY		0
-#define AC_QUANTITY		0	
-#define PSU_QUANTITY		2
-#define ONE_CONNECTOR_USE	0
+#ifdef AWRegular
+	#define MAX_PSU_QUANTITY	62
+	#define CHAdeMO_QUANTITY	1
+	#define CCS_QUANTITY		1
+	#define GB_QUANTITY		0
+	#define AC_QUANTITY		1	
+	#define PSU_QUANTITY		2
+	#define ONE_CONNECTOR_USE	0
+#elif BYTONGB
+	#define MAX_PSU_QUANTITY        62
+        #define CHAdeMO_QUANTITY        1
+        #define CCS_QUANTITY            1
+        #define GB_QUANTITY             0
+        #define AC_QUANTITY             1
+        #define PSU_QUANTITY            2
+        #define ONE_CONNECTOR_USE       0
+#elif DW30
+        #define MAX_PSU_QUANTITY        62
+        #define CHAdeMO_QUANTITY        1
+        #define CCS_QUANTITY            1
+        #define GB_QUANTITY             0
+        #define AC_QUANTITY             0
+        #define PSU_QUANTITY            2
+        #define ONE_CONNECTOR_USE       0
+#elif DM30
+        #define MAX_PSU_QUANTITY        62
+        #define CHAdeMO_QUANTITY        1
+        #define CCS_QUANTITY            1
+        #define GB_QUANTITY             0
+        #define AC_QUANTITY             0
+        #define PSU_QUANTITY            2
+        #define ONE_CONNECTOR_USE       0
+#elif DS60120
+        #define MAX_PSU_QUANTITY        62
+        #define CHAdeMO_QUANTITY        1
+        #define CCS_QUANTITY            1
+        #define GB_QUANTITY             0
+        #define AC_QUANTITY             0
+        #define PSU_QUANTITY            2
+        #define ONE_CONNECTOR_USE       0
+#elif DS60210
+        #define MAX_PSU_QUANTITY        62
+        #define CHAdeMO_QUANTITY        1
+        #define CCS_QUANTITY            1
+        #define GB_QUANTITY             0
+        #define AC_QUANTITY             0
+        #define PSU_QUANTITY            2
+        #define ONE_CONNECTOR_USE       0
+#else
+	#define MAX_PSU_QUANTITY        62
+        #define CHAdeMO_QUANTITY        1
+        #define CCS_QUANTITY            1
+        #define GB_QUANTITY             0
+        #define AC_QUANTITY             1
+        #define PSU_QUANTITY            2
+        #define ONE_CONNECTOR_USE       0
+#endif
+
 
 /*SystemLog message*/
 #define SystemLogMessage			//for debug info save to log file

Makefile

@@ -270,8 +270,8 @@ DM30-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-	@cd EVSE/Modularization;make all
-	@cd EVSE/Projects/DM30/Apps;make all
+	@cd EVSE/Modularization;make Project=DM30 all
+	@cd EVSE/Projects/DM30/Apps;make Project=DM30 all
 	@rm -f EVSE/Projects/DM30/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
 	@mke2fs -vm0 /dev/ram0 131072
@@ -337,8 +337,8 @@ DW30-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-	@cd EVSE/Modularization;make all
-	@cd EVSE/Projects/DW30/Apps;make all
+	@cd EVSE/Modularization;make Project=DW30 all
+	@cd EVSE/Projects/DW30/Apps;make Project=DW30 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
@@ -408,8 +408,8 @@ DS60-120-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-	@cd EVSE/Modularization;make all
-	@cd EVSE/Projects/DS60-120/Apps;make all
+	@cd EVSE/Modularization;make Project=DS60120 all
+	@cd EVSE/Projects/DS60-120/Apps;make Project=DS60120 all
 	@rm -f EVSE/Projects/DS60-120/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
 	@mke2fs -vm0 /dev/ram0 131072
@@ -479,8 +479,8 @@ DS60-210-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-	@cd EVSE/Modularization;make all
-	@cd EVSE/Projects/DS60-210/Apps;make all
+	@cd EVSE/Modularization;make Project=DS60210 all
+	@cd EVSE/Projects/DS60-210/Apps;make Project=DS60210 all
 	@rm -f EVSE/Projects/DS60-210/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
 	@mke2fs -vm0 /dev/ram0 131072
@@ -550,8 +550,8 @@ AW-Regular-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-	@cd EVSE/Modularization;make all
-	@cd EVSE/Projects/AW-Regular/Apps;make all
+	@cd EVSE/Modularization;make Project=AWRegular all
+	@cd EVSE/Projects/AW-Regular/Apps;make Project=AWRegular all
 	@rm -f EVSE/Projects/AW-Regular/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
 	@mke2fs -vm0 /dev/ram0 131072
@@ -689,8 +689,8 @@ BYTON-GB-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-	@cd EVSE/Modularization;make all
-	@cd EVSE/Projects/BYTON-GB/Apps;make all
+	@cd EVSE/Modularization;make Project=BYTONGB all
+	@cd EVSE/Projects/BYTON-GB/Apps;make Project=BYTONGB all
 	@rm -f EVSE/Projects/BYTON-GB/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
 	@mke2fs -vm0 /dev/ram0 131072

run_gen_make_script.sh

@@ -45,8 +45,8 @@ echo -e "$1-rootfs:"
 echo -e "\t@echo ================================="
 echo -e "\t@echo     Building User rootfs"
 echo -e "\t@echo ================================="
-echo -e "#\t@cd EVSE/GPL;make all"
-echo -e "\t@cd EVSE/Modularization;make all"
+echo -e "#\t@cd EVSE/GPL;make Project=$1 all"
+echo -e "\t@cd EVSE/Modularization;make Project=$1 all"
 echo -e "\t@cd EVSE/Projects/$1/Apps;make all"
 echo -e "\t@rm -f EVSE/Projects/$1/Images/ramdisk.gz"
 echo -e "\t@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072"