Merge branch 'develop' into resolution
This commit is contained in:
commit
5d54c2bbe1
|
@ -111,8 +111,11 @@ char *timeToDate(long millis)
|
||||||
static char DATE[MAX_NAME_LENGTH];
|
static char DATE[MAX_NAME_LENGTH];
|
||||||
|
|
||||||
struct tm *timeinfo;
|
struct tm *timeinfo;
|
||||||
|
time_t time;
|
||||||
|
|
||||||
timeinfo = localtime(&millis);
|
time = millis;
|
||||||
|
|
||||||
|
timeinfo = localtime(&time);
|
||||||
|
|
||||||
strftime(DATE, MAX_NAME_LENGTH, "%d %b %Y, %I:%M%p", timeinfo);
|
strftime(DATE, MAX_NAME_LENGTH, "%d %b %Y, %I:%M%p", timeinfo);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue