Compare commits

..

No commits in common. "9874791aced3763033d6ced2b0390087dafd51d7" and "56654447d28c54ea2c999630132aa6591d7f6cc2" have entirely different histories.

6 changed files with 3 additions and 24 deletions

View File

@ -148,11 +148,6 @@ PowerInfo SAB::getPowerInfo(const unsigned char nbOfMeasures) const
return p;
}
const char *SAB::getSoftVersion() const
{
return SOFT_VERSION;
}
unsigned char SAB::getError() const
{
return _error;

View File

@ -10,7 +10,6 @@
#include "WEBServerManager.h"
#include "IOManager.h"
#include "TaskSchedulerManager.h"
#include "versions.h"
#include <Adafruit_SSD1306.h>
#include <RTClib.h>
#include <SD.h>
@ -39,7 +38,6 @@ class SAB
SDCardConfig getSdCardConfig() const;
PowerInfo getPowerInfo(const unsigned char nbOfMeasures = 5) const;
const char *getSoftVersion() const;
unsigned char getError() const;
private:
void initGPIO();

View File

@ -12,7 +12,7 @@ SAB sab;
unsigned long currentMs = 0, batteryMs = 0, buttonMs = 0;
volatile boolean ioStateChange(false);
View1Packet v1p = {sab.getRtcManager().getDateTime(), sab.getSdCardManager().getSize(GBYTE), sab.getPowerInfo(),0, sab.getSoftVersion()};
View1Packet v1p = {sab.getRtcManager().getDateTime(), sab.getSdCardManager().getSize(GBYTE), sab.getPowerInfo(),0};
ViewAPPacket vap = {sab.getConnectivityManager().softAPmacAddress(), sab.getConnectivityManager().softAPSSID(), sab.getConnectivityManager().softAPIP(), sab.getConnectivityManager().softAPgetStationNum()};
ViewSTAPacket vstap = {sab.getConnectivityManager().macAddress(), sab.getConnectivityManager().localIP(), sab.getConnectivityManager().RSSI()};
ViewIoInfoPacket vio = {{0},{0}};

View File

@ -1,12 +0,0 @@
#ifndef VERSIONS_H
#define VERSIONS_H
/**
* Here is listed the version history of the soft with some information about them.
*
* Versioning scheme MAJOR.MINOR.PATCH
*/
#define SOFT_VERSION "1.0.0" //First version tracking
#endif //VERSIONS_H

View File

@ -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] = "";
View1Packet *p = (View1Packet *) pData;
switch(p->powerInfo.powerType)
@ -20,10 +20,9 @@ boolean view_1(Adafruit_SSD1306 &display, void *pData)
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(pageTitle, "GLOBAL INFO v %s",p->version);
display.println(time_str);
display.setCursor(0,56);
display.println(pageTitle);
display.println(F("GLOBAL INFO"));
return true;
}

View File

@ -9,7 +9,6 @@ typedef struct view1Packet
float sdCardSize;
PowerInfo powerInfo;
unsigned char nbViews;
const char *version;
} View1Packet;
//Global info