diff --git a/src/app/views.cpp b/src/app/views.cpp index c2485af..f495dc1 100644 --- a/src/app/views.cpp +++ b/src/app/views.cpp @@ -1,6 +1,6 @@ #include "views.h" -boolean view_1(Adafruit_SSD1306 &display, void *pData) +boolean homeInfo(Adafruit_SSD1306 &display, void *pData) { char time_str[300] = "", power_str[15] = "", sdCard[10] = "", pageTitle[22] = "", zero_prepended[5][3] = {"","","","",""}; View1Packet *p = (View1Packet *) pData; @@ -19,14 +19,14 @@ boolean view_1(Adafruit_SSD1306 &display, void *pData) else sprintf(sdCard,"NO CARD"); - sprintf(time_str,"Time : %s:%s:%s\nDate : %s/%s/%d\nFree RAM : %d\nSdCard : %s\nPower : %s\nViews : %u\n" + sprintf_P(time_str, F("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); + sprintf_P(pageTitle, F("GLOBAL INFO v %s"),p->version); display.println(time_str); display.setCursor(0,56); display.println(pageTitle); @@ -34,16 +34,30 @@ boolean view_1(Adafruit_SSD1306 &display, void *pData) return true; } -boolean view_2(Adafruit_SSD1306 &display, void *pData) +boolean rtcInfo(Adafruit_SSD1306 &display, void *pData) +{ + char buffer[300] = ""; + SAB *p = (SAB *) pData; + + sprintf_P(buffer, F("Rtc temp : %.2f C"), p->getRtcManager().getTemperature()); + + display.println(buffer); + + display.setCursor(0,56); + display.println(F("RTC INFO")); + return true; +} + +boolean apInfo(Adafruit_SSD1306 &display, void *pData) { char conn_str[300]; ViewAPPacket *p = (ViewAPPacket *) pData; if(p->enabled) - sprintf(conn_str,"Ip addr : %u.%u.%u.%u\nMac addr : \n%s\nConns : %u\nSSID : %s\n" ,p->ipAddr[0], p->ipAddr[1], p->ipAddr[2], p->ipAddr[3], p->macAddr.c_str(), p->nbOfCon, p->ssid.c_str()); + sprintf_P(conn_str,F("Ip addr : %u.%u.%u.%u\nMac addr : \n%s\nConns : %u\nSSID : %s\n") ,p->ipAddr[0], p->ipAddr[1], p->ipAddr[2], p->ipAddr[3], p->macAddr.c_str(), p->nbOfCon, p->ssid.c_str()); else - sprintf(conn_str,"AP connectivity\nis not enabled\nCheck the cfg file\n"); + sprintf_P(conn_str,F("AP connectivity\nis not enabled\nCheck the cfg file\n")); display.println(conn_str); @@ -53,16 +67,16 @@ boolean view_2(Adafruit_SSD1306 &display, void *pData) return true; } -boolean view_3(Adafruit_SSD1306 &display, void *pData) +boolean staInfo(Adafruit_SSD1306 &display, void *pData) { char conn_str[300]; ViewSTAPacket *p = (ViewSTAPacket *) pData; if(p->enabled) - sprintf(conn_str,"Ip addr : %u.%u.%u.%u\nMac addr : \n%s\nSignal : %d dBm\n", p->ipAddr[0], p->ipAddr[1], p->ipAddr[2], p->ipAddr[3], p->macAddr.c_str(), p->sigStrength); + sprintf_P(conn_str, F("Ip addr : %u.%u.%u.%u\nMac addr : \n%s\nSignal : %d dBm\n"), p->ipAddr[0], p->ipAddr[1], p->ipAddr[2], p->ipAddr[3], p->macAddr.c_str(), p->sigStrength); else - sprintf(conn_str,"STA connectivity\nis not enabled\nCheck the cfg file\n"); + sprintf_P(conn_str,F("STA connectivity\nis not enabled\nCheck the cfg file\n")); display.println(conn_str); @@ -79,7 +93,7 @@ boolean memInfo(Adafruit_SSD1306 &display, void *pData) uint16_t biggestContigMemBlock; uint8_t frag; ESP.getHeapStats(&freeMem, &biggestContigMemBlock, &frag); - sprintf(dispBuffer, "Free RAM : %u\nHeap frag : %u\nMax block : %u\nFree Flash : %u\nProg size : %u\nCPU Freq : %u MHz\n", freeMem, frag, biggestContigMemBlock, ESP.getFreeSketchSpace(), ESP.getSketchSize(), ESP.getCpuFreqMHz()); + sprintf_P(dispBuffer, F("Free RAM : %u\nHeap frag : %u\nMax block : %u\nFree Flash : %u\nProg size : %u\nCPU Freq : %u MHz\n"), freeMem, frag, biggestContigMemBlock, ESP.getFreeSketchSpace(), ESP.getSketchSize(), ESP.getCpuFreqMHz()); display.println(dispBuffer); display.setCursor(0,56); diff --git a/src/app/views.h b/src/app/views.h index 3160a71..b0bba01 100644 --- a/src/app/views.h +++ b/src/app/views.h @@ -14,7 +14,7 @@ typedef struct view1Packet } View1Packet; //Global info -boolean view_1(Adafruit_SSD1306 &display, void *pData); +boolean homeInfo(Adafruit_SSD1306 &display, void *pData); typedef struct viewAPPacket { @@ -25,8 +25,11 @@ typedef struct viewAPPacket boolean enabled; } ViewAPPacket; +//Rtc infos +boolean rtcInfo(Adafruit_SSD1306 &display, void *pData); + //AP info -boolean view_2(Adafruit_SSD1306 &display, void *pData); +boolean apInfo(Adafruit_SSD1306 &display, void *pData); typedef struct viewSTAPacket { @@ -37,7 +40,7 @@ typedef struct viewSTAPacket } ViewSTAPacket; //STA info -boolean view_3(Adafruit_SSD1306 &display, void *pData); +boolean staInfo(Adafruit_SSD1306 &display, void *pData); //Memory INFO boolean memInfo(Adafruit_SSD1306 &display, void *pData);