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

Added a web socket server instance (no logic yet)

Browse Source
This commit is contained in:
anschrammh 2020-02-26 11:05:50 +01:00
parent 5b11c54635
commit dacfb6d4d1
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/SAB.cpp
View File

@ -14,6 +14,7 @@ _connectivityManager(NULL),
//_webServerManager(80, &_sdCardManager), //_webServerManager(80, &_sdCardManager),
_webServer(80, &_sdCardManager), _webServer(80, &_sdCardManager),
_ftpServer(21, &_sdCardManager, "ESP8266", "12345678"), _ftpServer(21, &_sdCardManager, "ESP8266", "12345678"),
_dbWSServer(81),
_pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire), _pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire),
_ioManager(_pcf), _ioManager(_pcf),
_taskSchedulerManager(_rtcManager), _taskSchedulerManager(_rtcManager),
@ -43,6 +44,7 @@ _error(0)
if(!_pcf.begin()){_error |= IO_INIT_ERR;} if(!_pcf.begin()){_error |= IO_INIT_ERR;}
_powerUpTime = _rtcManager.getDateTime(); _powerUpTime = _rtcManager.getDateTime();
_dbWSServer.begin();
} }
SAB::SAB(const BoardConfig boardConfig, const unsigned int webServerPort, const unsigned int ftpServerPort) : _boardConfig(boardConfig), SAB::SAB(const BoardConfig boardConfig, const unsigned int webServerPort, const unsigned int ftpServerPort) : _boardConfig(boardConfig),
@ -55,6 +57,7 @@ _connectivityManager(NULL),
//_webServerManager(webServerPort, &_sdCardManager), //_webServerManager(webServerPort, &_sdCardManager),
_webServer(webServerPort, &_sdCardManager), _webServer(webServerPort, &_sdCardManager),
_ftpServer(ftpServerPort, &_sdCardManager, "ESP8266", "12345678"), _ftpServer(ftpServerPort, &_sdCardManager, "ESP8266", "12345678"),
_dbWSServer(81),
_pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire), _pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire),
_ioManager(_pcf), _ioManager(_pcf),
_taskSchedulerManager(_rtcManager), _taskSchedulerManager(_rtcManager),
@ -83,6 +86,7 @@ _error(0)
if(!_pcf.begin()){_error |= IO_INIT_ERR;} if(!_pcf.begin()){_error |= IO_INIT_ERR;}
_powerUpTime = _rtcManager.getDateTime(); _powerUpTime = _rtcManager.getDateTime();
_dbWSServer.begin();
} }
void SAB::initGPIO() void SAB::initGPIO()
@ -174,4 +178,5 @@ void SAB::run()
_ftpServer.run(); _ftpServer.run();
_taskSchedulerManager.run(); _taskSchedulerManager.run();
_screenManager.run(); _screenManager.run();
_dbWSServer.loop();
} }

2
src/app/SAB.h
View File

@ -9,6 +9,7 @@
//#include "WEBServerManager.h" //#include "WEBServerManager.h"
#include "WEBClient.h" //includes WEBServer internally #include "WEBClient.h" //includes WEBServer internally
#include "FTPClient.h" //includes FTPServer internally #include "FTPClient.h" //includes FTPServer internally
#include "DashboardWSServer.h"
#include "IOManager.h" #include "IOManager.h"
#include "TaskSchedulerManager.h" #include "TaskSchedulerManager.h"
#include "PowerManager.h" #include "PowerManager.h"
@ -61,6 +62,7 @@ class SAB
//WEBServerManager _webServerManager; //WEBServerManager _webServerManager;
WEBServer<WEBClient> _webServer; WEBServer<WEBClient> _webServer;
FTPServer<FTPClient> _ftpServer; FTPServer<FTPClient> _ftpServer;
DashboardWSServer _dbWSServer;
PCF8574 _pcf; PCF8574 _pcf;
IOManager _ioManager; IOManager _ioManager;
TaskSchedulerManager _taskSchedulerManager; TaskSchedulerManager _taskSchedulerManager;