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

Added the use of the OTAManager class in the SAB class

Browse Source
This commit is contained in:
anschrammh 2022-09-27 07:29:48 +02:00
parent d0d5df2b98
commit 63b6cf626f
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/SAB.cpp
View File

@ -6,6 +6,7 @@ _screenManager(_display, &_sdCardManager),
_connectivityManager(_sdCardManager), _connectivityManager(_sdCardManager),
_webServer(80, &_sdCardManager, 10), _webServer(80, &_sdCardManager, 10),
_ftpServer(21, &_sdCardManager, "ESP8266", "12345678", 10), _ftpServer(21, &_sdCardManager, "ESP8266", "12345678", 10),
_otaManager(_sdCardManager, _boardConfig),
_dbWSServer(81), _dbWSServer(81),
_pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire), _pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire),
_ioManager(_pcf), _ioManager(_pcf),
@ -21,6 +22,7 @@ _screenManager(_display, &_sdCardManager),
_connectivityManager(_sdCardManager), _connectivityManager(_sdCardManager),
_webServer(webServerPort, &_sdCardManager, 10), _webServer(webServerPort, &_sdCardManager, 10),
_ftpServer(ftpServerPort, &_sdCardManager, "ESP8266", "12345678", 10), _ftpServer(ftpServerPort, &_sdCardManager, "ESP8266", "12345678", 10),
_otaManager(_sdCardManager, _boardConfig),
_dbWSServer(81), _dbWSServer(81),
_pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire), _pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire),
_ioManager(_pcf), _ioManager(_pcf),
@ -39,12 +41,18 @@ void SAB::initCommonConfig()
//We initialize the pins for the I2C communication //We initialize the pins for the I2C communication
Wire.begin(_boardConfig.getI2C_sda(), _boardConfig.getI2C_scl()); Wire.begin(_boardConfig.getI2C_sda(), _boardConfig.getI2C_scl());
if(!_rtc.begin()) _error |= RTC_BEGIN_ERR; if(!_rtc.begin())
_error |= RTC_BEGIN_ERR;
else else
{ {
_rtcManager.setDateTime(_rtc.now()); _rtcManager.setDateTime(_rtc.now());
} }
if(!_display.begin(SSD1306_SWITCHCAPVCC, _boardConfig.getI2C_screenAddress())){ _error |= DISP_BEGIN_ERR;}
if(!_display.begin(SSD1306_SWITCHCAPVCC, _boardConfig.getI2C_screenAddress()))
{
_error |= DISP_BEGIN_ERR;
}
if(!_sdCardManager.mountSD()) if(!_sdCardManager.mountSD())
{ {
_error |= SDCARD_INIT_ERR; _error |= SDCARD_INIT_ERR;
@ -52,9 +60,11 @@ void SAB::initCommonConfig()
_boardConfig.getSPISpeed(), _boardConfig.getSPISpeed(),
_boardConfig.getSPI_SDCard_cs()); _boardConfig.getSPI_SDCard_cs());
} }
_screenManager.init(); _screenManager.init();
if(!_connectivityManager.connect()){ _error |= CONNECT_ERR;} if(!_connectivityManager.connect()){ _error |= CONNECT_ERR;}
if(!_pcf.begin()){_error |= IO_INIT_ERR;} if(!_pcf.begin()){_error |= IO_INIT_ERR;}
if(!_otaManager.init()){_error |= OTA_INIT_ERR;}
//We set the different servers : //We set the different servers :
_webServer.setWWWDir(WWW_DIR); _webServer.setWWWDir(WWW_DIR);
@ -104,7 +114,12 @@ FTPServer<FTPClient>& SAB::getFtpServer()
return _ftpServer; return _ftpServer;
} }
IOManager& SAB::getIoManager() OTAManager& SAB::getOTAManager()
{
return _otaManager;
}
IOManager& SAB::getIOManager()
{ {
return _ioManager; return _ioManager;
} }

9
src/app/SAB.h
View File

@ -12,6 +12,7 @@
#include "IOManager.h" #include "IOManager.h"
#include "TaskSchedulerManager.h" #include "TaskSchedulerManager.h"
#include "PowerManager.h" #include "PowerManager.h"
#include "OTAManager.h"
#include "versions.h" #include "versions.h"
#include <Adafruit_SSD1306.h> #include <Adafruit_SSD1306.h>
#include <RTClib.h> #include <RTClib.h>
@ -20,7 +21,7 @@
class SAB class SAB
{ {
public: public:
enum Error {RTC_BEGIN_ERR = 1, DISP_BEGIN_ERR = 2, SDCARD_INIT_ERR = 4, IO_INIT_ERR = 8, CONNECT_ERR = 16}; enum Error {RTC_BEGIN_ERR = 1, DISP_BEGIN_ERR = 2, SDCARD_INIT_ERR = 4, IO_INIT_ERR = 8, CONNECT_ERR = 16, OTA_INIT_ERR = 32};
SAB(); SAB();
SAB(const BoardConfig boardConfig, const unsigned int webServerPort = 80, const unsigned int ftpServerPort = 21); SAB(const BoardConfig boardConfig, const unsigned int webServerPort = 80, const unsigned int ftpServerPort = 21);
@ -33,10 +34,10 @@ class SAB
RTC_DS3231& getRTC_DS3231(); RTC_DS3231& getRTC_DS3231();
SDCardManager& getSdCardManager(); SDCardManager& getSdCardManager();
ConnectivityManager& getConnectivityManager(); ConnectivityManager& getConnectivityManager();
//WEBServerManager& getWebServerManager();
WEBServer<WEBClient>& getWebServer(); WEBServer<WEBClient>& getWebServer();
FTPServer<FTPClient>& getFtpServer(); FTPServer<FTPClient>& getFtpServer();
IOManager& getIoManager(); OTAManager& getOTAManager();
IOManager& getIOManager();
TaskSchedulerManager& getTaskSchedulerManager(); TaskSchedulerManager& getTaskSchedulerManager();
PowerManager& getPowerManager(); PowerManager& getPowerManager();
TimeSpan getUpTime() const; TimeSpan getUpTime() const;
@ -56,9 +57,9 @@ class SAB
RTC_DS3231 _rtc; RTC_DS3231 _rtc;
RtcManager _rtcManager; RtcManager _rtcManager;
ConnectivityManager _connectivityManager; ConnectivityManager _connectivityManager;
//WEBServerManager _webServerManager;
WEBServer<WEBClient> _webServer; WEBServer<WEBClient> _webServer;
FTPServer<FTPClient> _ftpServer; FTPServer<FTPClient> _ftpServer;
OTAManager _otaManager;
DashboardWSServer _dbWSServer; DashboardWSServer _dbWSServer;
PCF8574 _pcf; PCF8574 _pcf;
IOManager _ioManager; IOManager _ioManager;