Merge branch 'develop' into resolution

This commit is contained in:
Steve 2018-12-13 07:59:39 +00:00
commit 5d54c2bbe1
1 changed files with 4 additions and 1 deletions

View File

@ -111,8 +111,11 @@ char *timeToDate(long millis)
static char DATE[MAX_NAME_LENGTH];
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);