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

Minor changes

Browse Source
This commit is contained in:
Anatole SCHRAMM 2019-04-30 13:38:58 +02:00
parent dd0b07e67b
commit 4bf746db65
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/ConnectivityManager.cpp
View File

@ -8,13 +8,13 @@ ConnectivityManager::ConnectivityManager() : _error(0), _sdCardManager(NULL)
if(!softAP("ESP8266SwissArmyBoard", NULL, 1, false, 8))_error &= AP_SETUP_ERR; if(!softAP("ESP8266SwissArmyBoard", NULL, 1, false, 8))_error &= AP_SETUP_ERR;
} }
ConnectivityManager::ConnectivityManager(SDCardManager *sdCardManager) : _error(0), _sdCardManager(sdCardManager) ConnectivityManager::ConnectivityManager(SDCardManager &sdCardManager) : _error(0), _sdCardManager(&sdCardManager)
{ {
persistent(false); persistent(false);
if(!enableSTAAndAP(false))_error &= AP_AND_STA_ENABLED_ERR; if(!enableSTAAndAP(false))_error &= AP_AND_STA_ENABLED_ERR;
else else
{ {
CFGFileParser cfgFileParser(*sdCardManager, AP_CFG_FILE); CFGFileParser cfgFileParser(sdCardManager, AP_CFG_FILE);
CFGDictionary<CFGParameterValue> *cfgDictionary = (CFGDictionary<CFGParameterValue> *) cfgFileParser.parseFile(); CFGDictionary<CFGParameterValue> *cfgDictionary = (CFGDictionary<CFGParameterValue> *) cfgFileParser.parseFile();
if(cfgDictionary == NULL) if(cfgDictionary == NULL)
{ {
@ -31,7 +31,7 @@ ConnectivityManager::ConnectivityManager(SDCardManager *sdCardManager) : _error(
delete cfgDictionary; delete cfgDictionary;
} }
CFGFileParser cfgFileParserSTA(*sdCardManager, STA_CFG_FILE); CFGFileParser cfgFileParserSTA(sdCardManager, STA_CFG_FILE);
cfgDictionary = (CFGDictionary<CFGParameterValue> *) cfgFileParserSTA.parseFile(); cfgDictionary = (CFGDictionary<CFGParameterValue> *) cfgFileParserSTA.parseFile();
if(cfgDictionary != NULL) if(cfgDictionary != NULL)
{ {

2
src/app/ConnectivityManager.h
View File

@ -21,7 +21,7 @@ class ConnectivityManager : public ESP8266WiFiClass
unsigned char getError() const; unsigned char getError() const;
protected: protected:
ConnectivityManager(); ConnectivityManager();
ConnectivityManager(SDCardManager *sdCardManager); ConnectivityManager(SDCardManager &sdCardManager);
private: private:
unsigned char _error; unsigned char _error;
SDCardManager *_sdCardManager; SDCardManager *_sdCardManager;

5
src/app/IOManager.h
View File

@ -5,13 +5,14 @@
class IOManager class IOManager
{ {
friend class SAB;
public: public:
IOManager(PCF8574 &pcf);
void setISROnIOChange(void (*isrFunc)(), Pin pin = GPIO_0); void setISROnIOChange(void (*isrFunc)(), Pin pin = GPIO_0);
PCF8574 &getPcf(); PCF8574 &getPcf();
protected:
IOManager(PCF8574 &pcf);
private: private:
PCF8574 &_pcf; PCF8574 &_pcf;
protected:
}; };
#endif //IOMANAGER_H #endif //IOMANAGER_H

4
src/app/SAB.cpp
View File

@ -23,7 +23,7 @@ _error(0)
if(!_rtc.begin()) _error |= RTC_BEGIN_ERR; if(!_rtc.begin()) _error |= RTC_BEGIN_ERR;
if(!_display.begin(SSD1306_SWITCHCAPVCC, _screenConfig.getAddress())){ _error |= DISP_BEGIN_ERR; } if(!_display.begin(SSD1306_SWITCHCAPVCC, _screenConfig.getAddress())){ _error |= DISP_BEGIN_ERR; }
if(!_sdCardManager.begin(_sdCardConfig.getSPISpeed(), _pinConfig.getSPI_sdCard_cs())){ _error |= SDCARD_INIT_ERR; Serial.print("Failed to init SDCard : SPI_SPEED : "); Serial.print(_sdCardConfig.getSPISpeed()); Serial.print(" CS PIN : "); Serial.println(_pinConfig.getSPI_sdCard_cs());} if(!_sdCardManager.begin(_sdCardConfig.getSPISpeed(), _pinConfig.getSPI_sdCard_cs())){ _error |= SDCARD_INIT_ERR; Serial.print("Failed to init SDCard : SPI_SPEED : "); Serial.print(_sdCardConfig.getSPISpeed()); Serial.print(" CS PIN : "); Serial.println(_pinConfig.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;}
} }
@ -51,7 +51,7 @@ _error(0)
if(!_rtc.begin()) _error |= RTC_BEGIN_ERR; if(!_rtc.begin()) _error |= RTC_BEGIN_ERR;
if(!_display.begin(SSD1306_SWITCHCAPVCC, _screenConfig.getAddress())) _error |= DISP_BEGIN_ERR; if(!_display.begin(SSD1306_SWITCHCAPVCC, _screenConfig.getAddress())) _error |= DISP_BEGIN_ERR;
if(!_sdCardManager.begin(_sdCardConfig.getSPISpeed(), _pinConfig.getSPI_sdCard_cs())){ _error |= SDCARD_INIT_ERR; Serial.print("Failed to init SDCard : SPI_SPEED : "); Serial.print(_sdCardConfig.getSPISpeed()); Serial.print(" CS PIN : "); Serial.println(_pinConfig.getSPI_sdCard_cs());} if(!_sdCardManager.begin(_sdCardConfig.getSPISpeed(), _pinConfig.getSPI_sdCard_cs())){ _error |= SDCARD_INIT_ERR; Serial.print("Failed to init SDCard : SPI_SPEED : "); Serial.print(_sdCardConfig.getSPISpeed()); Serial.print(" CS PIN : "); Serial.println(_pinConfig.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;}
} }