diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-24 14:42:30 -0500 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-24 15:45:41 -0500 |
commit | 4e493c670aaabd8179976621d4b0bf3997fdc814 (patch) | |
tree | febfef70c77381508cbcc19976c5eaf23c35ad09 /wirish/Print.h | |
parent | 7a5627be405c5f3353f58198ec4437a7e8138dff (diff) | |
download | librambutan-4e493c670aaabd8179976621d4b0bf3997fdc814.tar.gz librambutan-4e493c670aaabd8179976621d4b0bf3997fdc814.zip |
Rewrote Print class.
The old Print class couldn't print uint64 values, and featured
hand-hacked functionality better handled by snprintf(). Redid it
using snprintf(), using "[u]int[8,16,32,64]" types for more clarity,
and eliminated some private methods in favor of auxiliary functions in
Print.cpp.
Breaking compatibility with original implementation in three ways:
- Print::print(double) is now accurate to 6 digits, rather
than 2; this is consistent with the default behavior of the %f
format specifier, and if you're using floating point, it's slow
enough that you probably want the increased accuracy.
- The only bases you can print a number to are 2, 8, 10, and
16. 8, 10, and 16 already have format specifiers, and 2 is an
important special case; others complicate matters unnecessarily.
- Printing numbers in bases other than 10 treats them as
unsigned quantities (i.e., won't print '-' characters). This is
more consistent with C++'s behavior for hexadecimal and octal
literals (e.g., 0xFFFFFFFF has type uint32).
Updated HardwareSerial and USBSerial class documentation to reflect
the new behavior.
Diffstat (limited to 'wirish/Print.h')
-rw-r--r-- | wirish/Print.h | 87 |
1 files changed, 46 insertions, 41 deletions
diff --git a/wirish/Print.h b/wirish/Print.h index dc21183..4527948 100644 --- a/wirish/Print.h +++ b/wirish/Print.h @@ -1,62 +1,67 @@ -/* - * Print.h - Base class that provides print() and println() - * Copyright (c) 2008 David A. Mellis. All right reserved. +/****************************************************************************** + * The MIT License * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * Copyright (c) 2011 LeafLabs, LLC. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + *****************************************************************************/ -#ifndef Print_h -#define Print_h +#ifndef _PRINT_H_ +#define _PRINT_H_ -#include <libmaple_types.h> -#include <stdio.h> // for size_t +#include "libmaple_types.h" -#define DEC 10 -#define HEX 16 -#define OCT 8 -#define BIN 2 -#define BYTE 0 +#define DEC 10 +#define HEX 16 +#define OCT 8 +#define BIN 2 +#define BYTE 0 // yuck -class Print -{ - private: - void printNumber(unsigned long, uint8); - void printFloat(double, uint8); +class Print { public: virtual void write(uint8) = 0; virtual void write(const char *str); - virtual void write(void *, uint32); + virtual void write(void *buf, uint32 size); + void print(char); void print(const char[]); void print(uint8); - void print(int); - void print(unsigned int); - void print(long); - void print(unsigned long); - void print(long, int); + void print(int32); + void print(uint32); + void print(int64); + void print(uint64); + void print(int32, int); + void print(int64, int); void print(double); + void println(void); void println(char); void println(const char[]); void println(uint8); - void println(int); - void println(unsigned int); - void println(long); - void println(unsigned long); - void println(long, int); + void println(int32); + void println(uint32); + void println(int64); + void println(uint64); + void println(int32, int); + void println(int64, int); void println(double); }; |