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

Changes related to previous changes...

Browse Source
This commit is contained in:
anschrammh 2019-10-20 18:17:00 +02:00
parent 9660d38dac
commit 163c15ef68
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/SAB.cpp
View File

@ -1,8 +1,10 @@
#include "SAB.h" #include "SAB.h"
SAB::SAB() : _display(_boardConfig.getScreenWidth(), _boardConfig.getScreenHeight(), &Wire), SAB::SAB() : _sdCardManager(_boardConfig.getSPI_SDCard_cs(), _boardConfig.getSPISpeed()),
_screenManager(_display), _rtc(), _display(_boardConfig.getScreenWidth(),_boardConfig.getScreenHeight(), &Wire),
_rtcManager(_rtc), _sdCardManager(_boardConfig.getSPI_SDCard_cs(), _boardConfig.getSPISpeed()), _screenManager(_display, &_sdCardManager),
_rtc(),
_rtcManager(_rtc),
_connectivityManager(NULL), _connectivityManager(NULL),
//_webServerManager(80, &_sdCardManager), //_webServerManager(80, &_sdCardManager),
_webServer(80, &_sdCardManager), _webServer(80, &_sdCardManager),
@ -14,8 +16,8 @@ _error(0)
{ {
//We set the gpio up //We set the gpio up
initGPIO(); initGPIO();
//Serial.begin(9600);
Serial.begin(500000, SERIAL_8N1, SERIAL_TX_ONLY); Serial.begin(500000, SERIAL_8N1, SERIAL_TX_ONLY);
Serial.println();
delay(200); delay(200);
//We initialize the pins for the I2C communication //We initialize the pins for the I2C communication
@ -23,16 +25,17 @@ _error(0)
if(!_rtc.begin()) _error |= RTC_BEGIN_ERR; if(!_rtc.begin()) _error |= RTC_BEGIN_ERR;
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()){ _error |= SDCARD_INIT_ERR; Serial.print("Failed to init SDCard : SPI_SPEED : "); Serial.print(8000000); Serial.print(" CS PIN : "); Serial.println(_boardConfig.getSPI_SDCard_cs());} if(!_sdCardManager.mountSD()){ _error |= SDCARD_INIT_ERR; Serial.print("Failed to init SDCard : SPI_SPEED : "); Serial.print(8000000); Serial.print(" CS PIN : "); Serial.println(_boardConfig.getSPI_SDCard_cs());}
_screenManager.init();
_connectivityManager = new ConnectivityManager(_sdCardManager); _connectivityManager = new ConnectivityManager(_sdCardManager);
if(!_pcf.begin()){_error |= IO_INIT_ERR;} if(!_pcf.begin()){_error |= IO_INIT_ERR;}
} }
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),
_sdCardManager(_boardConfig.getSPI_SDCard_cs(), _boardConfig.getSPISpeed()),
_display(_boardConfig.getScreenWidth(), _boardConfig.getScreenHeight(), &Wire), _display(_boardConfig.getScreenWidth(), _boardConfig.getScreenHeight(), &Wire),
_screenManager(_display), _screenManager(_display, &_sdCardManager),
_rtc(), _rtc(),
_rtcManager(_rtc), _rtcManager(_rtc),
_sdCardManager(_boardConfig.getSPI_SDCard_cs(), _boardConfig.getSPISpeed()),
_connectivityManager(NULL), _connectivityManager(NULL),
//_webServerManager(webServerPort, &_sdCardManager), //_webServerManager(webServerPort, &_sdCardManager),
_webServer(webServerPort, &_sdCardManager), _webServer(webServerPort, &_sdCardManager),
@ -44,14 +47,15 @@ _error(0)
{ {
//We set the gpio up //We set the gpio up
initGPIO(); initGPIO();
//Serial.begin(9600);
Serial.begin(500000, SERIAL_8N1, SERIAL_TX_ONLY); Serial.begin(500000, SERIAL_8N1, SERIAL_TX_ONLY);
Serial.println();
delay(200); delay(200);
//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;
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()){ _error |= SDCARD_INIT_ERR; Serial.print("Failed to init SDCard : SPI_SPEED : "); Serial.print(8000000); Serial.print(" CS PIN : "); Serial.println(_boardConfig.getSPI_SDCard_cs());} if(!_sdCardManager.mountSD()){ _error |= SDCARD_INIT_ERR; Serial.print("Failed to init SDCard : SPI_SPEED : "); Serial.print(8000000); Serial.print(" CS PIN : "); Serial.println(_boardConfig.getSPI_SDCard_cs());}
_screenManager.init();
_connectivityManager = new ConnectivityManager(_sdCardManager); _connectivityManager = new ConnectivityManager(_sdCardManager);
if(!_pcf.begin()){_error |= IO_INIT_ERR;} if(!_pcf.begin()){_error |= IO_INIT_ERR;}
} }

1
src/app/app.ino
View File

@ -55,6 +55,7 @@ void setup()
sab.getWebServer().addApiRoutine("/sab/web/apitester", &(apiTesterApi), NULL); sab.getWebServer().addApiRoutine("/sab/web/apitester", &(apiTesterApi), NULL);
sab.getWebServer().addApiRoutine("/sab/view/next", &(nextViewApi), &sab, WEBServer<WEBClient>::GET); sab.getWebServer().addApiRoutine("/sab/view/next", &(nextViewApi), &sab, WEBServer<WEBClient>::GET);
sab.getWebServer().addApiRoutine("/sab/view/reloadcfg", &(reloadViewApi), &sab, WEBServer<WEBClient>::GET);
sab.getWebServer().addApiRoutine("/sab/view", &(viewByUIDApi), &sab, WEBServer<WEBClient>::GET); sab.getWebServer().addApiRoutine("/sab/view", &(viewByUIDApi), &sab, WEBServer<WEBClient>::GET);
sab.getWebServer().addApiRoutine("/sab/rtc/get/datetime", &(rtcGetTimeApi), &sab, WEBServer<WEBClient>::GET); sab.getWebServer().addApiRoutine("/sab/rtc/get/datetime", &(rtcGetTimeApi), &sab, WEBServer<WEBClient>::GET);
sab.getWebServer().addApiRoutine("/sab/rtc/set/datetime", &(rtcSetTimeApi), &sab, WEBServer<WEBClient>::GET); sab.getWebServer().addApiRoutine("/sab/rtc/set/datetime", &(rtcSetTimeApi), &sab, WEBServer<WEBClient>::GET);