From 6add78730d95c75ce9e952de7659942328ea5d90 Mon Sep 17 00:00:00 2001 From: anschrammh Date: Sun, 31 Mar 2019 19:01:52 +0200 Subject: [PATCH] Updated constructor definition list --- src/app/SAB.cpp | 27 +++++++++++++++++++++++++-- src/app/SAB.h | 5 ++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/app/SAB.cpp b/src/app/SAB.cpp index 777c7c6..bd5febf 100644 --- a/src/app/SAB.cpp +++ b/src/app/SAB.cpp @@ -1,6 +1,14 @@ #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); delay(200); @@ -13,7 +21,17 @@ SAB::SAB() : _screenConfig(128, 64, 0x3C), _sdCardConfig(SPI_FULL_SPEED), _displ _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); delay(200); @@ -46,6 +64,11 @@ ConnectivityManager& SAB::getConnectivityManager() return *_connectivityManager; } +WEBServerManager& SAB::getWebServerManager() +{ + return _webServerManager; +} + ScreenConfig SAB::getScreenConfig() const { return _screenConfig; diff --git a/src/app/SAB.h b/src/app/SAB.h index 3eedfe3..4b1347b 100644 --- a/src/app/SAB.h +++ b/src/app/SAB.h @@ -7,6 +7,7 @@ #include "ScreenManager.h" #include "SDCardManager.h" #include "ConnectivityManager.h" +#include "WEBServerManager.h" #include #include #include @@ -15,7 +16,7 @@ class SAB { public: 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() { delete _connectivityManager; @@ -25,6 +26,7 @@ class SAB RtcManager& getRtcManager(); SDCardManager& getSdCardManager(); ConnectivityManager& getConnectivityManager(); + WEBServerManager& getWebServerManager(); ScreenConfig getScreenConfig() const; PinMapping getPinConfig() const; SDCardConfig getSdCardConfig() const; @@ -42,6 +44,7 @@ class SAB RtcManager _rtcManager; SDCardManager _sdCardManager; ConnectivityManager *_connectivityManager; + WEBServerManager _webServerManager; unsigned char _error; };