2020.03.16 / Folus Wen

Actions:
1. EVSE/Modularization/Module_4G.c debug info print to consolse determine by ConsloePrintLog define.
2. EVSE/Modularization/Module_Wifi.c debug info print to consolse determine by ConsloePrintLog define.
3. EVSE/Modularization/Makefile add include path to Module_4g & Module_Wifi compile command.

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

@@ -31,14 +31,14 @@ Module_RFIDLib:
 
 Module_Wifi:
 	rm -f Module_Wifi
-	$(CC) -D $(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_Wifi.o Module_Wifi.c
+	$(CC) -D $(Project) -I ../Projects -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) -D $(Project) -O0 -g3 -Wall -c -fmessage-length=0 -o Module_4g.o Module_4g.c
+	$(CC) -D $(Project) -I ../Projects -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

EVSE/Modularization/Module_4g.c

@@ -25,14 +25,12 @@
 #include 	<string.h>
 #include	<time.h>
 #include	<ctype.h>
-//#include	"define.h"
-#include	"../Projects/define.h"
+#include	"define.h"
 
 #define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 #define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 #define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
-#define Debug
 #define ARRAY_SIZE(A)		(sizeof(A) / sizeof(A[0]))
 #define PASS	1
 #define FAIL	-1
@@ -100,7 +98,6 @@ struct SysConfigAndInfo			*ShmSysConfigAndInfo;
 struct StatusCodeData 			*ShmStatusCodeData;
 struct FanModuleData			*ShmFanModuleData;
 
-#ifdef SystemLogMessage
 int StoreLogMsg(const char *fmt, ...)
 {
 	char Buf[4096+256];
@@ -120,14 +117,16 @@ int StoreLogMsg(const char *fmt, ...)
 			tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 			buffer,
 			tm->tm_year+1900,tm->tm_mon+1);
+#ifdef SystemLogMessage
 	system(Buf);
-	#ifdef Debug
+#endif	
+
+#ifdef ConsloePrintLog
 	printf("[%04d.%02d.%02d %02d:%02d:%02d] - %s", tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec, buffer);
-	#endif
+#endif
 
 	return rc;
 }
-#endif
 
 int DiffTimeb(struct timeb ST, struct timeb ET)
 {

EVSE/Modularization/Module_Wifi.c

@@ -34,14 +34,12 @@
 #include	<time.h>
 #include	<ctype.h>
 #include 	<ifaddrs.h>
-//#include	"define.h"
-#include	"../Projects/define.h"
+#include	"define.h"
 
 #define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 #define DEBUG_WARN(format, args...) StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 #define DEBUG_ERROR(format, args...) StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
-#define Debug
 #define ARRAY_SIZE(A)				(sizeof(A) / sizeof(A[0]))
 #define PASS						1
 #define FAIL			   			-1
@@ -161,7 +159,9 @@ int StoreLogMsg(const char *fmt, ...)
 	system(Buf);
 #endif
 
+#ifdef ConsloePrintLog	
 	printf("[%04d.%02d.%02d %02d:%02d:%02d] - %s", tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec, buffer);
+#endif
 
 	return rc;
 }