Merge pull request esp8266#843 from pgollor/wifilib_mod

use String instead of char pointer for SSID() and psk()
nowaktechnik · Sep 30, 2015 · e95a615 · e95a615
2 parents 3241d90 + 9351984
commit e95a615
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -370,18 +370,18 @@ IPAddress ESP8266WiFiClass::gatewayIP()
     return IPAddress(ip.gw.addr);
 }
 
-char* ESP8266WiFiClass::SSID()
+String ESP8266WiFiClass::SSID() const
 {
     static struct station_config conf;
     wifi_station_get_config(&conf);
-    return reinterpret_cast<char*>(conf.ssid);
+    return String(reinterpret_cast<char*>(conf.ssid));
 }
 
-const char* ESP8266WiFiClass::psk()
+String ESP8266WiFiClass::psk() const
 {
     static struct station_config conf;
     wifi_station_get_config(&conf);
-    return reinterpret_cast<const char*>(conf.password);
+		return String(reinterpret_cast<char*>(conf.password));
 }
 
 uint8_t* ESP8266WiFiClass::BSSID(void)

diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
@@ -173,21 +173,21 @@ class ESP8266WiFiClass
      *
      * return: ssid string
      */
-    char* SSID();
+    String SSID() const;
 
     /*
      * Return the current pre shared key associated with the network
      *
      * return: psk string
      */
-    const char* psk();
+    String psk() const;
 
     /*
      * Return the current bssid / mac associated with the network if configured
      *
      * return: bssid uint8_t *
      */
-    uint8_t * BSSID(void);
+    uint8_t *BSSID(void);
 
     /*
      * Return the current bssid / mac associated with the network if configured

diff --git a/...are/esp8266com/esp8266/libraries/ESP8266mDNS/examples/OTA-mDNS-SPIFFS/OTA-mDNS-SPIFFS.ino b/...are/esp8266com/esp8266/libraries/ESP8266mDNS/examples/OTA-mDNS-SPIFFS/OTA-mDNS-SPIFFS.ino
@@ -240,12 +240,8 @@ void setup()
     delay(10);
   }
 
-  // ... Load sdk config.
-  String ssid(WiFi.SSID());
-  String psk(WiFi.psk());
-
-  // ... Compare fiel config with sdk config.
-  if (ssid != station_ssid || psk != station_psk)
+  // ... Compare file config with sdk config.
+  if (WiFi.SSID() != station_ssid || WiFi.psk() != station_psk)
   {
     Serial.println("WiFi config changed.");