noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107 from martinayotte/master 

STM32F4 - change IPAddress::toCharArray() into IPAddress::toString()
This commit is contained in:
Roger Clark 2015-09-07 08:12:39 +10:00
parent 88d2457f30 4909e1f465
commit a7f45917e0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
STM32F4/cores/maple/IPAddress.cpp
View File

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

3
STM32F4/cores/maple/IPAddress.h
View File

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