Skip to content

Update WString #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 8, 2018
Merged

Update WString #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69a2a52
WString: add `toDouble`
fpistm Sep 4, 2018
acbeffb
WString: Align with Arduino
fpistm Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cores/arduino/WString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,11 @@ long String::toInt(void) const

float String::toFloat(void) const
{
if (buffer) return float(atof(buffer));
return float(toDouble());
}

double String::toDouble(void) const
{
if (buffer) return atof(buffer);
return 0;
}
5 changes: 5 additions & 0 deletions cores/arduino/WString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ class String
void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
{getBytes((unsigned char *)buf, bufsize, index);}
const char * c_str() const { return buffer; }
char* begin() { return buffer; }
char* end() { return buffer + length(); }
const char* begin() const { return c_str(); }
const char* end() const { return c_str() + length(); }

// search
int indexOf( char ch ) const;
Expand All @@ -186,6 +190,7 @@ class String
// parsing/conversion
long toInt(void) const;
float toFloat(void) const;
double toDouble(void) const;

protected:
char *buffer; // the actual char array
Expand Down