Mar 19, 2019
diff --git a/api/Print.cpp b/api/Print.cpp
  return x.printTo(*this);
 }

 size_t Print::printf(char const * fmt, ...)
 {
  va_list args;
  va_start(args, fmt);
  size_t const n = vprintf(fmt, args);
  va_end(args);
  return n;
 }

 size_t Print::println(void)
 {
  return write("\r\n");
  return n;
 }

 size_t Print::printfln(char const * fmt, ...)
 {
  va_list args;
  va_start(args, fmt);
  size_t n = vprintf(fmt, args);
  va_end(args);
  n += println();
  return n;
 }

 // Private Methods /////////////////////////////////////////////////////////////

 size_t Print::printNumber(unsigned long n, uint8_t base)

  return n;
 }

 size_t Print::vprintf(char const * fmt, va_list args)
 {
  static size_t const MSG_BUF_SIZE = 64;
  char msg_buf[MSG_BUF_SIZE] = {0};

  int const length = vsnprintf(msg_buf, MSG_BUF_SIZE, fmt, args);

  return write(msg_buf, length);
 }
diff --git a/api/Print.h b/api/Print.h
    size_t printNumber(unsigned long, uint8_t);
    size_t printULLNumber(unsigned long long, uint8_t);
    size_t printFloat(double, uint8_t);
    size_t vprintf(char const * fmt, va_list args);
  protected:
    void setWriteError(int err = 1) { write_error = err; }
  public:
    size_t print(unsigned long long, int = DEC);
    size_t print(double, int = 2);
    size_t print(const Printable&);
    size_t printf(char const * fmt, ...);

    size_t println(const __FlashStringHelper *);
    size_t println(const String &s);
    size_t println(double, int = 2);
    size_t println(const Printable&);
    size_t println(void);
    size_t printfln(char const * fmt, ...);
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -144,6 +144,15 @@ size_t Print::print(const Printable& x)
		return x.printTo(*this);
		}

		size_t Print::printf(char const * fmt, ...)
		{
		va_list args;
		va_start(args, fmt);
		size_t const n = vprintf(fmt, args);
		va_end(args);
		return n;
		}

		size_t Print::println(void)
		{
		return write("\r\n");
Expand DownExpand Up		@@ -233,6 +242,16 @@ size_t Print::println(const Printable& x)
		return n;
		}

		size_t Print::printfln(char const * fmt, ...)
		{
		va_list args;
		va_start(args, fmt);
		size_t n = vprintf(fmt, args);
		va_end(args);
		n += println();
		return n;
		}

		// Private Methods /////////////////////////////////////////////////////////////

		size_t Print::printNumber(unsigned long n, uint8_t base)
Expand DownExpand Up		@@ -374,3 +393,13 @@ size_t Print::printFloat(double number, uint8_t digits)

		return n;
		}

		size_t Print::vprintf(char const * fmt, va_list args)
		{
		static size_t const MSG_BUF_SIZE = 64;
		char msg_buf[MSG_BUF_SIZE] = {0};

		int const length = vsnprintf(msg_buf, MSG_BUF_SIZE, fmt, args);

		return write(msg_buf, length);
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,6 +36,7 @@ class Print
		size_t printNumber(unsigned long, uint8_t);
		size_t printULLNumber(unsigned long long, uint8_t);
		size_t printFloat(double, uint8_t);
		size_t vprintf(char const * fmt, va_list args);
		protected:
		void setWriteError(int err = 1) { write_error = err; }
		public:
Expand DownExpand Up		@@ -67,6 +68,7 @@ class Print
		size_t print(unsigned long long, int = DEC);
		size_t print(double, int = 2);
		size_t print(const Printable&);
		size_t printf(char const * fmt, ...);

		size_t println(const __FlashStringHelper *);
		size_t println(const String &s);
Expand All		@@ -82,5 +84,6 @@ class Print
		size_t println(double, int = 2);
		size_t println(const Printable&);
		size_t println(void);
		size_t printfln(char const * fmt, ...);
		};