Updated Serial baud rate going from 115200 to 500000 and updating SDCardManager initialization

This commit is contained in:
anschrammh 2019-10-19 15:36:32 +02:00
parent 34ffc920a1
commit 7ed9eb6868

View File

@ -2,7 +2,7 @@
SAB::SAB() : _display(_boardConfig.getScreenWidth(), _boardConfig.getScreenHeight(), &Wire), SAB::SAB() : _display(_boardConfig.getScreenWidth(), _boardConfig.getScreenHeight(), &Wire),
_screenManager(_display), _rtc(), _screenManager(_display), _rtc(),
_rtcManager(_rtc), _sdCardManager(), _rtcManager(_rtc), _sdCardManager(_boardConfig.getSPI_SDCard_cs(), _boardConfig.getSPISpeed()),
_connectivityManager(NULL), _connectivityManager(NULL),
//_webServerManager(80, &_sdCardManager), //_webServerManager(80, &_sdCardManager),
_webServer(80, &_sdCardManager), _webServer(80, &_sdCardManager),
@ -15,14 +15,14 @@ _error(0)
//We set the gpio up //We set the gpio up
initGPIO(); initGPIO();
//Serial.begin(9600); //Serial.begin(9600);
Serial.begin(115200, SERIAL_8N1, SERIAL_TX_ONLY); Serial.begin(500000, SERIAL_8N1, SERIAL_TX_ONLY);
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.begin(_boardConfig.getSPI_SDCard_cs(), _boardConfig.getSPISpeed())){ _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());}
_connectivityManager = new ConnectivityManager(_sdCardManager); _connectivityManager = new ConnectivityManager(_sdCardManager);
if(!_pcf.begin()){_error |= IO_INIT_ERR;} if(!_pcf.begin()){_error |= IO_INIT_ERR;}
} }
@ -32,7 +32,7 @@ _display(_boardConfig.getScreenWidth(), _boardConfig.getScreenHeight(), &Wire),
_screenManager(_display), _screenManager(_display),
_rtc(), _rtc(),
_rtcManager(_rtc), _rtcManager(_rtc),
_sdCardManager(), _sdCardManager(_boardConfig.getSPI_SDCard_cs(), _boardConfig.getSPISpeed()),
_connectivityManager(NULL), _connectivityManager(NULL),
//_webServerManager(webServerPort, &_sdCardManager), //_webServerManager(webServerPort, &_sdCardManager),
_webServer(webServerPort, &_sdCardManager), _webServer(webServerPort, &_sdCardManager),
@ -45,13 +45,13 @@ _error(0)
//We set the gpio up //We set the gpio up
initGPIO(); initGPIO();
//Serial.begin(9600); //Serial.begin(9600);
Serial.begin(115200, SERIAL_8N1, SERIAL_TX_ONLY); Serial.begin(500000, SERIAL_8N1, SERIAL_TX_ONLY);
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.begin(_boardConfig.getSPI_SDCard_cs(), _boardConfig.getSPISpeed())){ _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());}
_connectivityManager = new ConnectivityManager(_sdCardManager); _connectivityManager = new ConnectivityManager(_sdCardManager);
if(!_pcf.begin()){_error |= IO_INIT_ERR;} if(!_pcf.begin()){_error |= IO_INIT_ERR;}
} }