Th3maz1ng/ESP8266_swiss_army_board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a new view to display rtc info and renamed a few old views for clarity

Browse Source
This commit is contained in:
anschrammh 2019-10-31 21:47:43 +01:00
parent 36f87a27a8
commit e699b89faf
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/app/views.cpp
View File

@ -1,6 +1,6 @@
#include "views.h" #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] = {"","","","",""}; char time_str[300] = "", power_str[15] = "", sdCard[10] = "", pageTitle[22] = "", zero_prepended[5][3] = {"","","","",""};
View1Packet *p = (View1Packet *) pData; View1Packet *p = (View1Packet *) pData;
@ -19,14 +19,14 @@ boolean view_1(Adafruit_SSD1306 &display, void *pData)
else else
sprintf(sdCard,"NO CARD"); 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[0],p->dateTime.hour(),'0')
, dateTimeFormater(zero_prepended[1],p->dateTime.minute(),'0') , dateTimeFormater(zero_prepended[1],p->dateTime.minute(),'0')
, dateTimeFormater(zero_prepended[2],p->dateTime.second(),'0') , dateTimeFormater(zero_prepended[2],p->dateTime.second(),'0')
, dateTimeFormater(zero_prepended[3],p->dateTime.day(),'0') , dateTimeFormater(zero_prepended[3],p->dateTime.day(),'0')
, dateTimeFormater(zero_prepended[4],p->dateTime.month(),'0') , dateTimeFormater(zero_prepended[4],p->dateTime.month(),'0')
, p->dateTime.year(),ESP.getFreeHeap(),sdCard,power_str, p->nbViews); , 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.println(time_str);
display.setCursor(0,56); display.setCursor(0,56);
display.println(pageTitle); display.println(pageTitle);
@ -34,16 +34,30 @@ boolean view_1(Adafruit_SSD1306 &display, void *pData)
return true; 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]; char conn_str[300];
ViewAPPacket *p = (ViewAPPacket *) pData; ViewAPPacket *p = (ViewAPPacket *) pData;
if(p->enabled) 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 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); display.println(conn_str);
@ -53,16 +67,16 @@ boolean view_2(Adafruit_SSD1306 &display, void *pData)
return true; return true;
} }
boolean view_3(Adafruit_SSD1306 &display, void *pData) boolean staInfo(Adafruit_SSD1306 &display, void *pData)
{ {
char conn_str[300]; char conn_str[300];
ViewSTAPacket *p = (ViewSTAPacket *) pData; ViewSTAPacket *p = (ViewSTAPacket *) pData;
if(p->enabled) 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 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); display.println(conn_str);
@ -79,7 +93,7 @@ boolean memInfo(Adafruit_SSD1306 &display, void *pData)
uint16_t biggestContigMemBlock; uint16_t biggestContigMemBlock;
uint8_t frag; uint8_t frag;
ESP.getHeapStats(&freeMem, &biggestContigMemBlock, &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.println(dispBuffer);
display.setCursor(0,56); display.setCursor(0,56);

9
src/app/views.h
View File

@ -14,7 +14,7 @@ typedef struct view1Packet
} View1Packet; } View1Packet;
//Global info //Global info
boolean view_1(Adafruit_SSD1306 &display, void *pData); boolean homeInfo(Adafruit_SSD1306 &display, void *pData);
typedef struct viewAPPacket typedef struct viewAPPacket
{ {
@ -25,8 +25,11 @@ typedef struct viewAPPacket
boolean enabled; boolean enabled;
} ViewAPPacket; } ViewAPPacket;
//Rtc infos
boolean rtcInfo(Adafruit_SSD1306 &display, void *pData);
//AP info //AP info
boolean view_2(Adafruit_SSD1306 &display, void *pData); boolean apInfo(Adafruit_SSD1306 &display, void *pData);
typedef struct viewSTAPacket typedef struct viewSTAPacket
{ {
@ -37,7 +40,7 @@ typedef struct viewSTAPacket
} ViewSTAPacket; } ViewSTAPacket;
//STA info //STA info
boolean view_3(Adafruit_SSD1306 &display, void *pData); boolean staInfo(Adafruit_SSD1306 &display, void *pData);
//Memory INFO //Memory INFO
boolean memInfo(Adafruit_SSD1306 &display, void *pData); boolean memInfo(Adafruit_SSD1306 &display, void *pData);