From 4bf746db65ec758d871e751e69b0f4bf9ad55c78 Mon Sep 17 00:00:00 2001
From: Anatole SCHRAMM <AS@isitecc.com>
Date: Tue, 30 Apr 2019 13:38:58 +0200
Subject: [PATCH] Minor changes

---
 src/app/ConnectivityManager.cpp | 6 +++---
 src/app/ConnectivityManager.h   | 2 +-
 src/app/IOManager.h             | 5 +++--
 src/app/SAB.cpp                 | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/app/ConnectivityManager.cpp b/src/app/ConnectivityManager.cpp
index 4ee7c0e..d84239c 100644
--- a/src/app/ConnectivityManager.cpp
+++ b/src/app/ConnectivityManager.cpp
@@ -8,13 +8,13 @@ ConnectivityManager::ConnectivityManager() : _error(0), _sdCardManager(NULL)
   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);
   if(!enableSTAAndAP(false))_error &= AP_AND_STA_ENABLED_ERR;
   else
   {
-    CFGFileParser cfgFileParser(*sdCardManager, AP_CFG_FILE);
+    CFGFileParser cfgFileParser(sdCardManager, AP_CFG_FILE);
     CFGDictionary<CFGParameterValue> *cfgDictionary = (CFGDictionary<CFGParameterValue> *) cfgFileParser.parseFile();
     if(cfgDictionary == NULL)
     {
@@ -31,7 +31,7 @@ ConnectivityManager::ConnectivityManager(SDCardManager *sdCardManager) : _error(
 	  delete cfgDictionary;
 	}
     
-    CFGFileParser cfgFileParserSTA(*sdCardManager, STA_CFG_FILE);
+    CFGFileParser cfgFileParserSTA(sdCardManager, STA_CFG_FILE);
     cfgDictionary = (CFGDictionary<CFGParameterValue> *) cfgFileParserSTA.parseFile();
     if(cfgDictionary != NULL)
     {
diff --git a/src/app/ConnectivityManager.h b/src/app/ConnectivityManager.h
index 2613a33..5c3497d 100644
--- a/src/app/ConnectivityManager.h
+++ b/src/app/ConnectivityManager.h
@@ -21,7 +21,7 @@ class ConnectivityManager : public ESP8266WiFiClass
     unsigned char getError() const;
   protected:
     ConnectivityManager();
-    ConnectivityManager(SDCardManager *sdCardManager);
+    ConnectivityManager(SDCardManager &sdCardManager);
   private:
     unsigned char _error;
     SDCardManager *_sdCardManager;
diff --git a/src/app/IOManager.h b/src/app/IOManager.h
index 2bfc125..e6eea4f 100644
--- a/src/app/IOManager.h
+++ b/src/app/IOManager.h
@@ -5,13 +5,14 @@
 
 class IOManager
 {
+  friend class SAB;
   public:
-    IOManager(PCF8574 &pcf);
     void setISROnIOChange(void (*isrFunc)(), Pin pin = GPIO_0);
     PCF8574 &getPcf();
+  protected:
+    IOManager(PCF8574 &pcf);
   private:
     PCF8574 &_pcf;
-  protected:
 };
 
 #endif //IOMANAGER_H
diff --git a/src/app/SAB.cpp b/src/app/SAB.cpp
index 779ac3b..a27a9b1 100644
--- a/src/app/SAB.cpp
+++ b/src/app/SAB.cpp
@@ -23,7 +23,7 @@ _error(0)
   if(!_rtc.begin()) _error |= RTC_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());}
-  _connectivityManager = new ConnectivityManager(&_sdCardManager);
+  _connectivityManager = new ConnectivityManager(_sdCardManager);
   if(!_pcf.begin()){_error |= IO_INIT_ERR;}
 }
 
@@ -51,7 +51,7 @@ _error(0)
   if(!_rtc.begin()) _error |= RTC_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());}
-  _connectivityManager = new ConnectivityManager(&_sdCardManager);
+  _connectivityManager = new ConnectivityManager(_sdCardManager);
   if(!_pcf.begin()){_error |= IO_INIT_ERR;}
 }