Răsfoiți Sursa

2020.06.05 / TC Hsu

Actions: Merge DM30 application to DW30, modify all StoreLogMsg() function, change the resolution of time stamp unit from second(s) to millisecond(ms).

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

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

Files:

	modified:   EVSE/Projects/DW30/Apps/FactoryConfig.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
TC_Hsu 4 ani în urmă
părinte
comite
92ddec9feb

+ 8 - 6
EVSE/Projects/DW30/Apps/FactoryConfig.c

@@ -46,19 +46,21 @@ int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
-    time_t CurrentTime;
-    struct tm *tm;
     va_list args;
+    struct timeb  SeqEndTime;
+    struct tm *tm;
 
     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,
+    ftime(&SeqEndTime);
+    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);

+ 8 - 6
EVSE/Projects/DW30/Apps/Module_EvComm.c

@@ -113,19 +113,21 @@ int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
-    time_t CurrentTime;
-    struct tm *tm;
     va_list args;
+    struct timeb  SeqEndTime;
+    struct tm *tm;
 
     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,
+    ftime(&SeqEndTime);
+    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);

+ 8 - 6
EVSE/Projects/DW30/Apps/Module_EventLogging.c

@@ -48,19 +48,21 @@ int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
-    time_t CurrentTime;
-    struct tm *tm;
     va_list args;
+    struct timeb  SeqEndTime;
+    struct tm *tm;
 
     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,
+    ftime(&SeqEndTime);
+    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);

+ 8 - 6
EVSE/Projects/DW30/Apps/Module_InternalComm.c

@@ -183,19 +183,21 @@ int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
-    time_t CurrentTime;
-    struct tm *tm;
     va_list args;
+    struct timeb  SeqEndTime;
+    struct tm *tm;
 
     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,
+    ftime(&SeqEndTime);
+    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);

+ 8 - 6
EVSE/Projects/DW30/Apps/Module_LcmControl.c

@@ -18,19 +18,21 @@ int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
-    time_t CurrentTime;
-    struct tm *tm;
     va_list args;
+    struct timeb  SeqEndTime;
+    struct tm *tm;
 
     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,
+    ftime(&SeqEndTime);
+    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);

+ 8 - 6
EVSE/Projects/DW30/Apps/Module_PrimaryComm.c

@@ -68,19 +68,21 @@ int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
-    time_t CurrentTime;
-    struct tm *tm;
     va_list args;
+    struct timeb  SeqEndTime;
+    struct tm *tm;
 
     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,
+    ftime(&SeqEndTime);
+    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);

+ 8 - 6
EVSE/Projects/DW30/Apps/Module_PsuComm.c

@@ -52,19 +52,21 @@ int StoreLogMsg(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
-    time_t CurrentTime;
-    struct tm *tm;
     va_list args;
+    struct timeb  SeqEndTime;
+    struct tm *tm;
 
     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,
+    ftime(&SeqEndTime);
+    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);

+ 8 - 6
EVSE/Projects/DW30/Apps/main.c

@@ -233,19 +233,21 @@ int StoreLogMsg_1(const char *fmt, ...)
 {
     char Buf[4096+256];
     char buffer[4096];
-    time_t CurrentTime;
-    struct tm *tm;
     va_list args;
+    struct timeb  SeqEndTime;
+    struct tm *tm;
 
     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,
+    ftime(&SeqEndTime);
+    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);