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

Updated constructor definition list

Browse Source
This commit is contained in:
anschrammh 2019-03-31 19:01:52 +02:00
parent 590e989612
commit 6add78730d
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/SAB.cpp
View File

@ -1,6 +1,14 @@
#include "SAB.h" #include "SAB.h"
SAB::SAB() : _screenConfig(128, 64, 0x3C), _sdCardConfig(SPI_FULL_SPEED), _display(_screenConfig.getWidth(), _screenConfig.getHeight(), &Wire), _screenManager(_display), _rtc(), _rtcManager(_rtc), _sdCardManager(), _connectivityManager(NULL), _error(0) SAB::SAB() : _screenConfig(128, 64, 0x3C),
_sdCardConfig(SPI_FULL_SPEED),
_display(_screenConfig.getWidth(),
_screenConfig.getHeight(), &Wire),
_screenManager(_display), _rtc(),
_rtcManager(_rtc), _sdCardManager(),
_connectivityManager(NULL),
_webServerManager(80, &_sdCardManager),
_error(0)
{ {
Serial.begin(9600); Serial.begin(9600);
delay(200); delay(200);
@ -13,7 +21,17 @@ SAB::SAB() : _screenConfig(128, 64, 0x3C), _sdCardConfig(SPI_FULL_SPEED), _displ
_connectivityManager = new ConnectivityManager(&_sdCardManager); _connectivityManager = new ConnectivityManager(&_sdCardManager);
} }
SAB::SAB(const PinMapping pinConfig, const ScreenConfig screenConfig, const SDCardConfig sdCardConfig) : _pinConfig(pinConfig), _screenConfig(screenConfig), _sdCardConfig(sdCardConfig), _display(_screenConfig.getWidth(), _screenConfig.getHeight(), &Wire), _screenManager(_display), _rtc(), _rtcManager(_rtc), _sdCardManager(), _connectivityManager(NULL), _error(0) SAB::SAB(const PinMapping pinConfig, const ScreenConfig screenConfig, const SDCardConfig sdCardConfig, const unsigned int webServerPort) : _pinConfig(pinConfig),
_screenConfig(screenConfig),
_sdCardConfig(sdCardConfig),
_display(_screenConfig.getWidth(), _screenConfig.getHeight(), &Wire),
_screenManager(_display),
_rtc(),
_rtcManager(_rtc),
_sdCardManager(),
_connectivityManager(NULL),
_webServerManager(webServerPort, &_sdCardManager),
_error(0)
{ {
Serial.begin(9600); Serial.begin(9600);
delay(200); delay(200);
@ -46,6 +64,11 @@ ConnectivityManager& SAB::getConnectivityManager()
return *_connectivityManager; return *_connectivityManager;
} }
WEBServerManager& SAB::getWebServerManager()
{
return _webServerManager;
}
ScreenConfig SAB::getScreenConfig() const ScreenConfig SAB::getScreenConfig() const
{ {
return _screenConfig; return _screenConfig;

5
src/app/SAB.h
View File

@ -7,6 +7,7 @@
#include "ScreenManager.h" #include "ScreenManager.h"
#include "SDCardManager.h" #include "SDCardManager.h"
#include "ConnectivityManager.h" #include "ConnectivityManager.h"
#include "WEBServerManager.h"
#include <Adafruit_SSD1306.h> #include <Adafruit_SSD1306.h>
#include <RTClib.h> #include <RTClib.h>
#include <SD.h> #include <SD.h>
@ -15,7 +16,7 @@ class SAB
{ {
public: public:
SAB(); SAB();
SAB(const PinMapping pinConfig, const ScreenConfig screenConfig, const SDCardConfig sdCardConfig); SAB(const PinMapping pinConfig, const ScreenConfig screenConfig, const SDCardConfig sdCardConfig, const unsigned int webServerPort);
~SAB() ~SAB()
{ {
delete _connectivityManager; delete _connectivityManager;
@ -25,6 +26,7 @@ class SAB
RtcManager& getRtcManager(); RtcManager& getRtcManager();
SDCardManager& getSdCardManager(); SDCardManager& getSdCardManager();
ConnectivityManager& getConnectivityManager(); ConnectivityManager& getConnectivityManager();
WEBServerManager& getWebServerManager();
ScreenConfig getScreenConfig() const; ScreenConfig getScreenConfig() const;
PinMapping getPinConfig() const; PinMapping getPinConfig() const;
SDCardConfig getSdCardConfig() const; SDCardConfig getSdCardConfig() const;
@ -42,6 +44,7 @@ class SAB
RtcManager _rtcManager; RtcManager _rtcManager;
SDCardManager _sdCardManager; SDCardManager _sdCardManager;
ConnectivityManager *_connectivityManager; ConnectivityManager *_connectivityManager;
WEBServerManager _webServerManager;
unsigned char _error; unsigned char _error;
}; };