diff --git a/src/app/views.cpp b/src/app/views.cpp index a706b90..a81224c 100644 --- a/src/app/views.cpp +++ b/src/app/views.cpp @@ -2,7 +2,7 @@ boolean view_1(Adafruit_SSD1306 &display, void *pData) { - char time_str[300] = "", power_str[15] = "", sdCard[10] = "", pageTitle[22] = ""; + char time_str[300] = "", power_str[15] = "", sdCard[10] = "", pageTitle[22] = "", zero_prepended[5][3] = {"","","","",""}; View1Packet *p = (View1Packet *) pData; switch(p->powerInfo.powerType) @@ -18,8 +18,14 @@ boolean view_1(Adafruit_SSD1306 &display, void *pData) sprintf(sdCard,"%.2fGB",p->sdCardSize); else sprintf(sdCard,"NO CARD"); - - sprintf(time_str,"Time : %d:%d:%d\nDate : %d/%d/%d\nFree RAM : %d\nSdCard : %s\nPower : %s\nViews : %u\n", p->dateTime.hour(), p->dateTime.minute(), p->dateTime.second(), p->dateTime.day(), p->dateTime.month(), p->dateTime.year(),ESP.getFreeHeap(),sdCard,power_str, p->nbViews); + + sprintf(time_str,"Time : %s:%s:%s\nDate : %s/%s/%d\nFree RAM : %d\nSdCard : %s\nPower : %s\nViews : %u\n" + , dateTimeFormater(zero_prepended[0],p->dateTime.hour(),'0') + , dateTimeFormater(zero_prepended[1],p->dateTime.minute(),'0') + , dateTimeFormater(zero_prepended[2],p->dateTime.second(),'0') + , dateTimeFormater(zero_prepended[3],p->dateTime.day(),'0') + , dateTimeFormater(zero_prepended[4],p->dateTime.month(),'0') + , p->dateTime.year(),ESP.getFreeHeap(),sdCard,power_str, p->nbViews); sprintf(pageTitle, "GLOBAL INFO v %s",p->version); display.println(time_str); display.setCursor(0,56); diff --git a/src/app/views.h b/src/app/views.h index 75b3fda..88c7868 100644 --- a/src/app/views.h +++ b/src/app/views.h @@ -10,6 +10,7 @@ typedef struct view1Packet PowerInfo powerInfo; unsigned char nbViews; const char *version; + SAB *sab; } View1Packet; //Global info