2019-12-30 / Folus Wen

Actions:
1. EVSE/Modularization/Module_Upgrade.c cancel include main.h and implement DEBUG marco by itselft.
2. EVSE/Modularization/Makefile implement Module_Upgrade item.

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: clean Module_RFIDLib Module_Wifi WebServiceLib OcppBackend Phihong_PsuCommObj Module_4g
+all: clean Module_RFIDLib Module_Wifi WebServiceLib OcppBackend Phihong_PsuCommObj Module_4g Module_UpgradeLib
 
 
 clean:
@@ -11,6 +11,8 @@ clean:
 	rm -f WebService
 	rm -f logPackTools
 	rm -f OcppBackend
+	rm -f libPhihong_PsuCommObj.a
+	rm -f libModule_Upgrade.a
 
 Module_RFIDLib:
 	rm -f libModule_RFID.a
@@ -54,3 +56,13 @@ Phihong_PsuCommObj:
 	$(AR) -r libPhihong_PsuCommObj.a Phihong_PsuCommObj.o
 	rm -f Phihong_PsuCommObj.o
 
+Module_UpgradeLib:
+	rm -f libModule_Upgrade.a
+	$(CC) -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/Modularization/Module_Upgrade.c

@@ -5,12 +5,14 @@
  *      Author: Jerry Wang
  *     Version: D0.01
  */
-#include 	"main.h"
 #include	"Module_Upgrade.h"
 
 //==================================
 // PRINT OUT LOG FORMAT
 //==================================
+#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 ARRAY_SIZE(A)		(sizeof(A) / sizeof(A[0]))
 #define PASS				1
@@ -20,6 +22,34 @@ struct SysConfigAndInfo			*ShmSysConfigAndInfo;
 struct StatusCodeData 			*ShmStatusCodeData;
 struct FanModuleData			*ShmFanModuleData;
 
+int StoreLogMsg(const char *fmt, ...)
+{
+	char Buf[4096+256];
+	char buffer[4096];
+	time_t CurrentTime;
+	struct tm *tm;
+	va_list args;
+
+	va_start(args, fmt);
+	int rc = vsnprintf(buffer, sizeof(buffer), fmt, args);
+	va_end(args);
+
+	memset(Buf,0,sizeof(Buf));
+	CurrentTime = time(NULL);
+	tm=localtime(&CurrentTime);
+	sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
+			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);
+#endif
+
+	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);
+
+	return rc;
+}
+
 int DiffTimebByUpgrade(struct timeb ST, struct timeb ET)
 {
 	//return milli-second