# HG changeset patch # User Michiel Broek # Date 1541276099 -3600 # Node ID dd52aecfc19d6a084d662050d73dc3bcb1d7946a # Parent c3c2fd13cf3b36eb8114e1e9bceee0ecaebe5d32 Fix for annotation log before normal log in the json brewlog. diff -r c3c2fd13cf3b -r dd52aecfc19d main/task_sdcard.c --- a/main/task_sdcard.c Thu Nov 01 19:51:41 2018 +0100 +++ b/main/task_sdcard.c Sat Nov 03 21:14:59 2018 +0100 @@ -47,7 +47,7 @@ extern time_t now; extern struct tm timeinfo; - +extern uint32_t TimeBrewing; void log_begin(time_t t) @@ -143,6 +143,8 @@ char bordercolor[9], color[9], pos[8]; FILE *f; bool addcomma = true; + int Hour = (TimeBrewing / 3600); + int Minute = ((TimeBrewing % 3600) / 60); if (strlen(sdcard_state->logfile)) { sprintf(filename, "/spiffs/log/%s.anno", sdcard_state->logfile); @@ -172,6 +174,7 @@ fclose(f); } + snprintf(json_log->time, 8, "%02d:%02d", Hour, Minute); f = fopen(filename, "a"); if (f) { if (addcomma) {