From dacfb6d4d15c619c354c3e4fe4c04537c16c4337 Mon Sep 17 00:00:00 2001 From: anschrammh Date: Wed, 26 Feb 2020 11:05:50 +0100 Subject: [PATCH] Added a web socket server instance (no logic yet) --- src/app/SAB.cpp | 5 +++++ src/app/SAB.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/app/SAB.cpp b/src/app/SAB.cpp index 42b6a2e..a2083c4 100644 --- a/src/app/SAB.cpp +++ b/src/app/SAB.cpp @@ -14,6 +14,7 @@ _connectivityManager(NULL), //_webServerManager(80, &_sdCardManager), _webServer(80, &_sdCardManager), _ftpServer(21, &_sdCardManager, "ESP8266", "12345678"), +_dbWSServer(81), _pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire), _ioManager(_pcf), _taskSchedulerManager(_rtcManager), @@ -43,6 +44,7 @@ _error(0) if(!_pcf.begin()){_error |= IO_INIT_ERR;} _powerUpTime = _rtcManager.getDateTime(); + _dbWSServer.begin(); } SAB::SAB(const BoardConfig boardConfig, const unsigned int webServerPort, const unsigned int ftpServerPort) : _boardConfig(boardConfig), @@ -55,6 +57,7 @@ _connectivityManager(NULL), //_webServerManager(webServerPort, &_sdCardManager), _webServer(webServerPort, &_sdCardManager), _ftpServer(ftpServerPort, &_sdCardManager, "ESP8266", "12345678"), +_dbWSServer(81), _pcf(_boardConfig.getI2C_IOExpanderAddress(), Wire), _ioManager(_pcf), _taskSchedulerManager(_rtcManager), @@ -83,6 +86,7 @@ _error(0) if(!_pcf.begin()){_error |= IO_INIT_ERR;} _powerUpTime = _rtcManager.getDateTime(); + _dbWSServer.begin(); } void SAB::initGPIO() @@ -174,4 +178,5 @@ void SAB::run() _ftpServer.run(); _taskSchedulerManager.run(); _screenManager.run(); + _dbWSServer.loop(); } diff --git a/src/app/SAB.h b/src/app/SAB.h index 9a48bba..40100dc 100644 --- a/src/app/SAB.h +++ b/src/app/SAB.h @@ -9,6 +9,7 @@ //#include "WEBServerManager.h" #include "WEBClient.h" //includes WEBServer internally #include "FTPClient.h" //includes FTPServer internally +#include "DashboardWSServer.h" #include "IOManager.h" #include "TaskSchedulerManager.h" #include "PowerManager.h" @@ -61,6 +62,7 @@ class SAB //WEBServerManager _webServerManager; WEBServer _webServer; FTPServer _ftpServer; + DashboardWSServer _dbWSServer; PCF8574 _pcf; IOManager _ioManager; TaskSchedulerManager _taskSchedulerManager;