2019-12-24 / Folus Wen

Actions:
1. Modularization/logPackTools.c some logic bug fix.
2. Modularization/Makefile copy output file to EVSE/rootfs/root/ when each target compiled.
3. ./Makefile enable Modularization make all in each targer-roofs.

files:
1. As follow commit history.

EVSE/Modularization/Makefile

@@ -1,7 +1,7 @@
 -include ../../Rules.make
 export PATH=/bin:/sbin:/usr/bin:$(SDK_PATH_TARGET)/usr/bin:$PATH
 
-all: Module_RFIDLib Module_Wifi WebServiceLib OcppBackend Phihong_PsuCommObj Module_4g
+all: clean Module_RFIDLib Module_Wifi WebServiceLib OcppBackend Phihong_PsuCommObj Module_4g
 
 
 clean:
@@ -23,12 +23,14 @@ Module_Wifi:
 	$(CC) -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) -o Module_4g Module_4g.o
 	rm -f Module_4g.o
+	cp -f Module_4g ../rootfs/root
 
 WebServiceLib:
 	rm -f WebService
@@ -38,13 +40,17 @@ WebServiceLib:
 	$(CC) -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/
+	cp -f logPackTools ../rootfs/root/
 
 OcppBackend:
 	rm -f OcppBackend; 
 	$(CC) ./ocppfiles/Module_OcppBackend.c ./ocppfiles/MessageHandler.c ./ocppfiles/JsonParser.c ./ocppfiles/SystemLogMessage.c ./ocppfiles/TransactionQueue.c ./ocppfiles/lib.c ./ocppfiles/HashTable.c ./ocppfiles/hashmap.c ./ocppfiles/array.c -I ../GPL/libwebsockets-v2.1-stable/release/include -I ../GPL/json-c-json-c-0.13.1-20180305/release/include/json-c -L ../GPL/libwebsockets-v2.1-stable/release/lib -L ../GPL/openssl-1.0.2g/release/lib -L ../GPL/json-c-json-c-0.13.1-20180305/release/lib -lwebsockets -ljson-c -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
 	$(AR) -r libPhihong_PsuCommObj.a Phihong_PsuCommObj.o
-	rm -f Phihong_PsuCommObj.o
+	rm -f Phihong_PsuCommObj.o
+

EVSE/Modularization/logPackTools.c

@@ -136,7 +136,7 @@ void split(char **arr, char *str, const char *del) {
 }
 
 int ConnectorType(char* connector){
-	int* result;
+	int result;
 	if(strcmp(connector, "0") == 0){
 		result= 0;
 	}
@@ -227,8 +227,8 @@ int main(int argc, char *argv[]) {
 	}
 	if(strcmp(argv[1], "log") == 0){
 		unsigned char			SerialNo[64];;
-		strcpy(SerialNo,ShmSysConfigAndInfo->SysConfig.SerialNumber);
-		printf(SerialNo);
+		memcpy(SerialNo,ShmSysConfigAndInfo->SysConfig.SerialNumber,ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.SerialNumber));
+		printf("%s", SerialNo);
 		int year,month,i,ty,tm,cnt;
 		char ym[7] ;
 		char pwd[70];
@@ -237,8 +237,8 @@ int main(int argc, char *argv[]) {
 		struct tm *pst = localtime(&tt); //把time_t類型轉換為struct tm類型
 		year = pst->tm_year + 1900;
 		month = pst->tm_mon + 1;
-		if(argc == 3 & isdigit(*argv[2])){
-			cnt=argv[2];
+		if((argc == 3) && isdigit(*argv[2])){
+			cnt=atoi(argv[2]);
 		}
 		else{
 			cnt=6;

EVSE/rootfs/root/.ssh/authorized_keys

@@ -0,0 +1,2 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgEnSPA95AKYtfuWCML/4gqo9qPD6aWiboUMVKp4h9HGpV3xxim2PryKi0JFkdYhU9KxWWMs3/nMLgBy0zEBjpYPx79UX93OJsFhJcqJ49bBapcmUqo8rJWWaMe7apkinVHiIN9cgBQy0MbmEgFcil23mcHuJzux3aQ9Hmf18oxbpL9a0fw29F28tE73jrPLpfJ24MKqZHbvnwiazY26Kxj+YU3T8h9d2p7nbypYBZJIDZxc0xtqLZWxkyFodDkGonZs1e4Xnr+77rGDhTAcAZxojPZRSNv0BlE/h7ffILMyZJ5JkfLP88VDLZRg1QHSWWWAYiWP1MF4HLtSjFczNIw== rsa-key-20191029
+

Makefile

@@ -53,7 +53,7 @@ Taurus-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-#	@cd EVSE/Modularization;make all
+	@cd EVSE/Modularization;make all
 	@cd EVSE/Projects/Taurus/Apps;make all
 	@rm -f EVSE/Projects/Taurus/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
@@ -199,7 +199,7 @@ DW25-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-#	@cd EVSE/Modularization;make all
+	@cd EVSE/Modularization;make all
 	@cd EVSE/Projects/DW25/Apps;make all
 	@rm -f EVSE/Projects/DW25/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
@@ -270,7 +270,7 @@ DM30-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-#	@cd EVSE/Modularization;make all
+	@cd EVSE/Modularization;make all
 	@cd EVSE/Projects/DM30/Apps;make all
 	@rm -f EVSE/Projects/DM30/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
@@ -337,7 +337,7 @@ DW30-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-#	@cd EVSE/Modularization;make all
+	@cd EVSE/Modularization;make all
 	@cd EVSE/Projects/DW30/Apps;make all
 	@rm -f EVSE/Projects/DW30/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
@@ -408,7 +408,7 @@ DS60-210-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-#	@cd EVSE/Modularization;make all
+	@cd EVSE/Modularization;make all
 	@cd EVSE/Projects/DS60-210/Apps;make all
 	@rm -f EVSE/Projects/DS60-210/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
@@ -479,7 +479,7 @@ AW-Regular-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-#	@cd EVSE/Modularization;make all
+	@cd EVSE/Modularization;make all
 	@cd EVSE/Projects/AW-Regular/Apps;make all
 	@rm -f EVSE/Projects/AW-Regular/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
@@ -550,7 +550,7 @@ AH-Luxury-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-#	@cd EVSE/Modularization;make all
+	@cd EVSE/Modularization;make all
 	@cd EVSE/Projects/AH-Luxury/Apps;make all
 	@rm -f EVSE/Projects/AH-Luxury/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072
@@ -618,7 +618,7 @@ BYTON-GB-rootfs:
 	@echo     Building User rootfs
 	@echo =================================
 #	@cd EVSE/GPL;make all
-#	@cd EVSE/Modularization;make all
+	@cd EVSE/Modularization;make all
 	@cd EVSE/Projects/BYTON-GB/Apps;make all
 	@rm -f EVSE/Projects/BYTON-GB/Images/ramdisk.gz
 	@dd if=/dev/zero of=/dev/ram0 bs=1k count=131072