954f9e5065
Move libmaple/*.h to (new) libmaple/include/libmaple/. The new
accepted way to include a libmaple header foo.h is with:
#include <libmaple/foo.h>
This is more polite in terms of the include namespace. It also allows
us to e.g. implement the Arduino SPI library at all (which has header
SPI.h; providing it was previously impossible on case-insensitive
filesystems due to libmaple's spi.h).
Similarly for Wirish.
The old include style (#include "header.h") is now deprecated.
libmaple/*.h:
- Change include guard #defines from _FOO_H_ to _LIBMAPLE_FOO_H_.
- Add license headers where they're missing
- Add conditional extern "C" { ... } blocks where they're missing
(they aren't always necessary, but we might was well do it against
the future, while we're at it.).
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
- Move includes after extern "C".
- Remove extra trailing newlines
Note that this doesn't include the headers under libmaple/usb/ or
libmaple/usb/usb_lib. These will get fixed later.
libmaple/*.c:
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
Makefile:
- Add I$(LIBMAPLE_PATH)/include/libmaple to GLOBAL_FLAGS. This allows
for users (including Wirish) to migrate their code, but should go
away ASAP, since it slows down compilation.
Wirish:
- Move wirish/**/*.h to (new) wirish/include/wirish/. This ignores
the USB headers, which, as usual, are getting handled after
everything else.
- Similarly generify wirish/boards/ structure. For each supported
board "foo", move wirish/boards/foo.h and wirish/boards/foo.cpp to
wirish/boards/foo/include/board/board.h and
wirish/boards/foo/board.cpp, respectively. Also remove the #ifdef
hacks around the .cpp files.
- wirish/rules.mk: put wirish/boards/foo/include in the include path
(and add wirish/boards/foo/board.cpp to the list of sources to be
compiled). This allows saying:
#include <board/board.h>
instead of the hack currently in place. We can allow the user to
override this setting later to make adding custom board definitions
easier.
- Disable -Werror in libmaple/rules.mk, as the current USB warnings
don't let the olimex_stm32_h103 board compile. We can re-enable
-Werror once we've moved the board-specific bits out of libmaple
proper.
libraries, examples:
- Update includes accordingly.
- Miscellaneous cosmetic fixups.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
68 lines
2 KiB
C++
68 lines
2 KiB
C++
/*
|
|
* Print.h - Base class that provides print() and println()
|
|
* Copyright (c) 2008 David A. Mellis. All right reserved.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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.
|
|
*
|
|
* Modified 12 April 2011 by Marti Bolivar <mbolivar@leaflabs.com>
|
|
*/
|
|
|
|
#ifndef _WIRISH_PRINT_H_
|
|
#define _WIRISH_PRINT_H_
|
|
|
|
#include <libmaple/libmaple_types.h>
|
|
|
|
enum {
|
|
BYTE = 0,
|
|
BIN = 2,
|
|
OCT = 8,
|
|
DEC = 10,
|
|
HEX = 16
|
|
};
|
|
|
|
class Print {
|
|
public:
|
|
virtual void write(uint8 ch) = 0;
|
|
virtual void write(const char *str);
|
|
virtual void write(const void *buf, uint32 len);
|
|
void print(char);
|
|
void print(const char[]);
|
|
void print(uint8, int=DEC);
|
|
void print(int, int=DEC);
|
|
void print(unsigned int, int=DEC);
|
|
void print(long, int=DEC);
|
|
void print(unsigned long, int=DEC);
|
|
void print(long long, int=DEC);
|
|
void print(unsigned long long, int=DEC);
|
|
void print(double, int=2);
|
|
void println(void);
|
|
void println(char);
|
|
void println(const char[]);
|
|
void println(uint8, int=DEC);
|
|
void println(int, int=DEC);
|
|
void println(unsigned int, int=DEC);
|
|
void println(long, int=DEC);
|
|
void println(unsigned long, int=DEC);
|
|
void println(long long, int=DEC);
|
|
void println(unsigned long long, int=DEC);
|
|
void println(double, int=2);
|
|
private:
|
|
void printNumber(unsigned long long, uint8);
|
|
void printFloat(double, uint8);
|
|
};
|
|
|
|
#endif
|