Merge pull request #107 from martinayotte/master

STM32F4 - change IPAddress::toCharArray() into IPAddress::toString()

Author: rogerclarkmelbourne

STM32F4/cores/maple/IPAddress.cpp

@@ -73,17 +73,15 @@ size_t IPAddress::printTo(Print& p) const
     return n;
 }
 
-char *IPAddress::toCharArray()
+String IPAddress::toString()
 {
-    static char szRet[20];
     String str = String(_address.bytes[0]);
     str += ".";
     str += String(_address.bytes[1]);
     str += ".";
     str += String(_address.bytes[2]);
     str += ".";
     str += String(_address.bytes[3]);
-    str.toCharArray(szRet, 20);
-    return szRet;
+    return str;
 }
 

STM32F4/cores/maple/IPAddress.h

@@ -21,6 +21,7 @@
 #define IPAddress_h
 
 #include <stdint.h>
+#include <WString.h>
 #include <Printable.h>
 
 // A class to make it easier to handle and pass around IP addresses
@@ -60,7 +61,7 @@ class IPAddress : public Printable {
     IPAddress& operator=(uint32_t address);
 
     virtual size_t printTo(Print& p) const;
-    char * toCharArray();
+    String toString();
 
     friend class EthernetClass;
     friend class UDP;