From 2b503977b91f9936af854f97844638d6996a6673 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Wed, 7 Jan 2015 02:09:55 +0300
Subject: [PATCH] Fix WiFi::softAPIP and keywords for ESP8266WiFi library

---
 libraries/ESP8266WiFi/keywords.txt        | 5 ++++-
 libraries/ESP8266WiFi/src/ESP8266WiFi.cpp | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/ESP8266WiFi/keywords.txt b/libraries/ESP8266WiFi/keywords.txt
index 7a6f0bc05..8f26dffaa 100644
--- a/libraries/ESP8266WiFi/keywords.txt
+++ b/libraries/ESP8266WiFi/keywords.txt
@@ -51,7 +51,10 @@ endPacket	KEYWORD2
 parsePacket	KEYWORD2
 remoteIP	KEYWORD2
 remotePort	KEYWORD2
-
+softAP	KEYWORD2
+softAPIP	KEYWORD2
+softAPmacAddress	KEYWORD2
+printDiag	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
index 26a7344f3..7c48bab9e 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -157,14 +157,13 @@ IPAddress ESP8266WiFiClass::localIP()
     return IPAddress(ip.ip.addr);
 }
 
-IPAddress softAPIP()
+IPAddress ESP8266WiFiClass::softAPIP()
 {
     struct ip_info ip;
     wifi_get_ip_info(SOFTAP_IF, &ip);
     return IPAddress(ip.ip.addr);    
 }
 
-
 IPAddress ESP8266WiFiClass::subnetMask()
 {
     struct ip_info ip;