rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

Backported Print class from ide-1.5.x branch

Browse Source 
Close #1951
This commit is contained in:
Cristian Maglie 2014-05-24 00:13:07 +02:00
parent fb8e439f3b
commit 44b5096e05
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/arduino/cores/arduino/Print.cpp
View File

@ -41,7 +41,7 @@ size_t Print::write(const uint8_t *buffer, size_t size)
size_t Print::print(const __FlashStringHelper *ifsh) size_t Print::print(const __FlashStringHelper *ifsh)
{ {
const char PROGMEM *p = (const char PROGMEM *)ifsh; PGM_P p = reinterpret_cast<PGM_P>(ifsh);
size_t n = 0; size_t n = 0;
while (1) { while (1) {
unsigned char c = pgm_read_byte(p++); unsigned char c = pgm_read_byte(p++);
@ -53,11 +53,7 @@ size_t Print::print(const __FlashStringHelper *ifsh)
size_t Print::print(const String &s) size_t Print::print(const String &s)
{ {
size_t n = 0; return write(s.c_str(), s.length());
for (uint16_t i = 0; i < s.length(); i++) {
n += write(s[i]);
}
return n;
} }
size_t Print::print(const char str[]) size_t Print::print(const char str[])

3
hardware/arduino/cores/arduino/Print.h
View File

@ -51,6 +51,9 @@ class Print
return write((const uint8_t *)str, strlen(str)); return write((const uint8_t *)str, strlen(str));
} }
virtual size_t write(const uint8_t *buffer, size_t size); virtual size_t write(const uint8_t *buffer, size_t size);
size_t write(const char *buffer, size_t size) {
return write((const uint8_t *)buffer, size);
}
size_t print(const __FlashStringHelper *); size_t print(const __FlashStringHelper *);
size_t print(const String &); size_t print(const String &);