[Improve][DM30][DW30][General]: Improve log print out method.

2020.06.15 / TC Hsu

Actions: Change the SwitchDebugFlag feature detect from PRINTF_FUNC() function to storeLogMsg() function.

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

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

Files:

	modified:   EVSE/Projects/DM30/Apps/Module_EvComm.c
	modified:   EVSE/Projects/DM30/Apps/Module_EventLogging.c
	modified:   EVSE/Projects/DM30/Apps/Module_InternalComm.c
	modified:   EVSE/Projects/DM30/Apps/Module_LcmControl.c
	modified:   EVSE/Projects/DM30/Apps/Module_PrimaryComm.c
	modified:   EVSE/Projects/DM30/Apps/Module_PsuComm.c
	modified:   EVSE/Projects/DM30/Apps/main.c
	modified:   EVSE/Projects/DW30/Apps/Module_EvComm.c
	modified:   EVSE/Projects/DW30/Apps/Module_EventLogging.c
	modified:   EVSE/Projects/DW30/Apps/Module_InternalComm.c
	modified:   EVSE/Projects/DW30/Apps/Module_LcmControl.c
	modified:   EVSE/Projects/DW30/Apps/Module_PrimaryComm.c
	modified:   EVSE/Projects/DW30/Apps/Module_PsuComm.c
	modified:   EVSE/Projects/DW30/Apps/main.c

EVSE/Projects/DM30/Apps/Module_EvComm.c

@@ -126,11 +126,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -153,10 +162,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 
 //=================================

EVSE/Projects/DM30/Apps/Module_EventLogging.c

@@ -39,7 +39,6 @@ struct StatusCodeData           *ShmStatusCodeData;
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 #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)
@@ -61,11 +60,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -88,10 +96,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 
 //=================================

EVSE/Projects/DM30/Apps/Module_InternalComm.c

@@ -164,7 +164,6 @@ int _alarm_code[] = {AC_OVP, AC_UVP, AC_OCP, AC_OTP, AC_GMI_FAULT, AC_CP_ERROR,
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 unsigned long GetTimeoutValue(struct timeval _sour_time);
 
 #define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
@@ -196,11 +195,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -228,10 +236,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 
 //==========================================

EVSE/Projects/DM30/Apps/Module_LcmControl.c

@@ -4,7 +4,6 @@ bool needReloadQr = true;
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 #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)
@@ -31,11 +30,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -61,10 +69,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 
 //==========================================

EVSE/Projects/DM30/Apps/Module_PrimaryComm.c

@@ -59,7 +59,6 @@ byte flash = NO;
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 #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)
@@ -81,11 +80,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -108,10 +116,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 //=================================
 // Common routine

EVSE/Projects/DM30/Apps/Module_PsuComm.c

@@ -35,7 +35,6 @@ float evseOutCur = 0;
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 #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)
@@ -67,11 +66,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -84,10 +92,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 //=================================
 // Common routine

EVSE/Projects/DM30/Apps/main.c

@@ -79,7 +79,7 @@ void StartSystemTimeoutDet(unsigned char flag);
 void StopSystemTimeoutDet();
 void StartGunInfoTimeoutDet(unsigned char gunIndex, unsigned char flag);
 void StopGunInfoTimeoutDet(unsigned char gunIndex);
-int StoreLogMsg_1(const char *fmt, ...);
+int StoreLogMsg(const char *fmt, ...);
 unsigned long GetTimeoutValue(struct timeval _sour_time);
 void gpio_set_value(unsigned int gpio, unsigned int value);
 void PRINTF_FUNC(char *string, ...);
@@ -95,9 +95,9 @@ int DB_Insert_Record(sqlite3 *db, int gun_index);
 int DB_Update_Operactive(sqlite3 *db, uint8_t gun_index, uint8_t IsAvailable);
 int DB_Get_Operactive(sqlite3 *db, uint8_t gun_index);
 
-#define DEBUG_INFO_MSG(format, args...) StoreLogMsg_1("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN_MSG(format, args...) StoreLogMsg_1("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR_MSG(format, args...) StoreLogMsg_1("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO_MSG(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN_MSG(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR_MSG(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 struct SysConfigAndInfo         *ShmSysConfigAndInfo;
 struct StatusCodeData           *ShmStatusCodeData;
@@ -429,7 +429,7 @@ int InitWatchDog()
     return fd;
 }
 
-int StoreLogMsg_1(const char *fmt, ...)
+int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
@@ -446,11 +446,20 @@ int StoreLogMsg_1(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -513,10 +522,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO_MSG("%s \n", buffer);
+    DEBUG_INFO_MSG("%s \n", buffer);
 }
 //==========================================
 // Check interface status

EVSE/Projects/DW30/Apps/Module_EvComm.c

@@ -126,11 +126,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -153,10 +162,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 
 //=================================

EVSE/Projects/DW30/Apps/Module_EventLogging.c

@@ -39,7 +39,6 @@ struct StatusCodeData           *ShmStatusCodeData;
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 #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)
@@ -61,11 +60,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -88,10 +96,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 
 //=================================

EVSE/Projects/DW30/Apps/Module_InternalComm.c

@@ -164,7 +164,6 @@ int _alarm_code[] = {AC_OVP, AC_UVP, AC_OCP, AC_OTP, AC_GMI_FAULT, AC_CP_ERROR,
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 unsigned long GetTimeoutValue(struct timeval _sour_time);
 
 #define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
@@ -196,11 +195,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -228,10 +236,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 
 //==========================================

EVSE/Projects/DW30/Apps/Module_LcmControl.c

@@ -4,7 +4,6 @@ bool needReloadQr = true;
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 #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)
@@ -31,11 +30,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -61,10 +69,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 
 //==========================================

EVSE/Projects/DW30/Apps/Module_PrimaryComm.c

@@ -59,7 +59,6 @@ byte flash = NO;
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 #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)
@@ -81,11 +80,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -108,10 +116,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 //=================================
 // Common routine

EVSE/Projects/DW30/Apps/Module_PsuComm.c

@@ -35,7 +35,6 @@ float evseOutCur = 0;
 
 void PRINTF_FUNC(char *string, ...);
 
-int StoreLogMsg(const char *fmt, ...);
 #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)
@@ -67,11 +66,20 @@ int StoreLogMsg(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -84,10 +92,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO("%s \n", buffer);
+    DEBUG_INFO("%s \n", buffer);
 }
 //=================================
 // Common routine

EVSE/Projects/DW30/Apps/main.c

@@ -79,7 +79,7 @@ void StartSystemTimeoutDet(unsigned char flag);
 void StopSystemTimeoutDet();
 void StartGunInfoTimeoutDet(unsigned char gunIndex, unsigned char flag);
 void StopGunInfoTimeoutDet(unsigned char gunIndex);
-int StoreLogMsg_1(const char *fmt, ...);
+int StoreLogMsg(const char *fmt, ...);
 unsigned long GetTimeoutValue(struct timeval _sour_time);
 void gpio_set_value(unsigned int gpio, unsigned int value);
 void PRINTF_FUNC(char *string, ...);
@@ -95,9 +95,9 @@ int DB_Insert_Record(sqlite3 *db, int gun_index);
 int DB_Update_Operactive(sqlite3 *db, uint8_t gun_index, uint8_t IsAvailable);
 int DB_Get_Operactive(sqlite3 *db, uint8_t gun_index);
 
-#define DEBUG_INFO_MSG(format, args...) StoreLogMsg_1("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_WARN_MSG(format, args...) StoreLogMsg_1("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
-#define DEBUG_ERROR_MSG(format, args...) StoreLogMsg_1("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_INFO_MSG(format, args...)     StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_WARN_MSG(format, args...)     StoreLogMsg("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
+#define DEBUG_ERROR_MSG(format, args...)    StoreLogMsg("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 
 struct SysConfigAndInfo         *ShmSysConfigAndInfo;
 struct StatusCodeData           *ShmStatusCodeData;
@@ -429,7 +429,7 @@ int InitWatchDog()
     return fd;
 }
 
-int StoreLogMsg_1(const char *fmt, ...)
+int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
@@ -446,11 +446,20 @@ int StoreLogMsg_1(const char *fmt, ...)
     SeqEndTime.time = time(NULL);
     tm=localtime(&SeqEndTime.time);
 
-    sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
-            buffer,
-            tm->tm_year+1900,tm->tm_mon+1);
-    system(Buf);
+    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
+    {
+        sprintf(Buf,"%02d:%02d:%02d.%03d - %s",
+                tm->tm_hour,tm->tm_min,tm->tm_sec,SeqEndTime.millitm, buffer);
+        printf("%s \n", Buf);
+    }
+    else
+    {
+        sprintf(Buf,"echo \"%04d-%02d-%02d %02d:%02d:%02d.%03d - %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,SeqEndTime.millitm,
+                buffer,
+                tm->tm_year+1900,tm->tm_mon+1);
+        system(Buf);
+    }
 
     return rc;
 }
@@ -513,10 +522,7 @@ void PRINTF_FUNC(char *string, ...)
     vsnprintf(buffer, sizeof(buffer), string, args);
     va_end(args);
 
-    if (ShmSysConfigAndInfo->SysConfig.SwitchDebugFlag == YES)
-        printf("%s \n", buffer);
-    else
-        DEBUG_INFO_MSG("%s \n", buffer);
+    DEBUG_INFO_MSG("%s \n", buffer);
 }
 //==========================================
 // Check interface status