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>
185 lines
5 KiB
C++
185 lines
5 KiB
C++
/*
|
|
* print-test.cpp
|
|
*
|
|
* Tests the various Print methods. (For USBSerial; assuming that
|
|
* writing a single character works, this should generalize to
|
|
* HardwareSerial).
|
|
*
|
|
* This file is released into the public domain.
|
|
*/
|
|
|
|
#include <wirish/wirish.h>
|
|
#undef min
|
|
#undef max
|
|
|
|
// For snprintf()
|
|
#include <stdio.h>
|
|
// The <limits.h> that comes with newlib is missing LLONG_MAX, etc.
|
|
#include <limits>
|
|
|
|
using namespace std;
|
|
|
|
#define BUF_SIZE 100
|
|
char buf[BUF_SIZE];
|
|
|
|
void test_numbers(void);
|
|
void test_base_arithmetic(void);
|
|
void test_floating_point(void);
|
|
|
|
void print_separator(void);
|
|
|
|
void setup() {
|
|
while (!SerialUSB.available())
|
|
continue;
|
|
SerialUSB.read();
|
|
}
|
|
|
|
void loop() {
|
|
SerialUSB.println("Testing Print methods.");
|
|
print_separator();
|
|
|
|
test_numbers();
|
|
print_separator();
|
|
|
|
test_base_arithmetic();
|
|
print_separator();
|
|
|
|
test_floating_point();
|
|
print_separator();
|
|
|
|
SerialUSB.println("Test finished.");
|
|
while (true) {
|
|
continue;
|
|
}
|
|
}
|
|
|
|
void test_numbers(void) {
|
|
SerialUSB.println("Numeric types:");
|
|
|
|
SerialUSB.print("unsigned char: ");
|
|
// prevent Print from treating it as an (extended) ASCII character:
|
|
SerialUSB.println((uint32)numeric_limits<unsigned char>::max());
|
|
|
|
SerialUSB.print("int: ");
|
|
SerialUSB.print(numeric_limits<int>::min());
|
|
SerialUSB.print(" -- ");
|
|
SerialUSB.println(numeric_limits<int>::max());
|
|
|
|
SerialUSB.print("unsigned int: ");
|
|
SerialUSB.print(numeric_limits<unsigned int>::max());
|
|
SerialUSB.println();
|
|
|
|
SerialUSB.print("long: ");
|
|
SerialUSB.print(numeric_limits<long>::min());
|
|
SerialUSB.print(" -- ");
|
|
SerialUSB.println(numeric_limits<long>::max());
|
|
|
|
SerialUSB.print("long long: ");
|
|
SerialUSB.print(numeric_limits<long long>::min());
|
|
SerialUSB.print(" -- ");
|
|
SerialUSB.println(numeric_limits<long long>::max());
|
|
|
|
SerialUSB.print("unsigned long long: ");
|
|
SerialUSB.println(numeric_limits<unsigned long long>::max());
|
|
}
|
|
|
|
void base_test(int base) {
|
|
SerialUSB.print("\tuint8: ");
|
|
SerialUSB.println(numeric_limits<uint8>::max(), base);
|
|
SerialUSB.print("\tint: ");
|
|
SerialUSB.print(numeric_limits<int>::max(), base);
|
|
SerialUSB.print(", unsigned int: ");
|
|
SerialUSB.println(numeric_limits<unsigned int>::max(), base);
|
|
SerialUSB.print("\tlong: ");
|
|
SerialUSB.print(numeric_limits<long>::max(), base);
|
|
SerialUSB.print(", unsigned long: ");
|
|
SerialUSB.println(numeric_limits<unsigned long>::max(), base);
|
|
SerialUSB.print("\tlong long: ");
|
|
SerialUSB.print(numeric_limits<long long>::max(), base);
|
|
SerialUSB.print(", unsigned long long: ");
|
|
SerialUSB.println(numeric_limits<unsigned long long>::max(), base);
|
|
}
|
|
|
|
void test_base_arithmetic(void) {
|
|
SerialUSB.println("Base arithmetic:");
|
|
|
|
SerialUSB.println("Binary:");
|
|
base_test(BIN);
|
|
|
|
SerialUSB.println("Octal:");
|
|
base_test(OCT);
|
|
|
|
SerialUSB.println("Decimal:");
|
|
base_test(DEC);
|
|
|
|
SerialUSB.println("Hexadecimal:");
|
|
base_test(HEX);
|
|
}
|
|
|
|
void test_floating_point(void) {
|
|
double dmax = numeric_limits<double>::max();
|
|
|
|
SerialUSB.println("Floating point:");
|
|
|
|
SerialUSB.print("println(-5.67): ");
|
|
SerialUSB.print(-5.67);
|
|
SerialUSB.print(". println(5.67, 5): ");
|
|
SerialUSB.println(5.67, 5);
|
|
SerialUSB.print("println((double)(LLONG_MAX - 10)): ");
|
|
SerialUSB.print((double)(numeric_limits<long long>::max() - 10));
|
|
SerialUSB.print("; from snprintf(): ");
|
|
snprintf(buf, BUF_SIZE, "%.2f",
|
|
(double)(numeric_limits<long long>::max() - 10));
|
|
SerialUSB.println(buf);
|
|
SerialUSB.print("println((double)LLONG_MAX / 2): ");
|
|
SerialUSB.print((double)(numeric_limits<long long>::max()) / 2);
|
|
SerialUSB.print("; from snprintf(): ");
|
|
snprintf(buf, BUF_SIZE, "%.2f",
|
|
(double)(numeric_limits<long long>::max()) / 2);
|
|
SerialUSB.println(buf);
|
|
SerialUSB.print("DBL_MAX: ");
|
|
SerialUSB.print(dmax);
|
|
SerialUSB.print("; from snprintf(): ");
|
|
snprintf(buf, BUF_SIZE, "%g", dmax);
|
|
SerialUSB.println(buf);
|
|
SerialUSB.print("-DBL_MAX / 2: ");
|
|
SerialUSB.print(-dmax / 2.0);
|
|
SerialUSB.print("; from snprintf(): ");
|
|
snprintf(buf, BUF_SIZE, "%g", -dmax / 2.0);
|
|
SerialUSB.println(buf);
|
|
SerialUSB.print("Double epsilon, round error: ");
|
|
SerialUSB.print(numeric_limits<double>::epsilon());
|
|
SerialUSB.print(", ");
|
|
SerialUSB.println(numeric_limits<double>::round_error());
|
|
|
|
SerialUSB.println();
|
|
|
|
float fmax = numeric_limits<float>::max();
|
|
|
|
SerialUSB.print("println(-5.67f): ");
|
|
SerialUSB.println(-5.67f);
|
|
SerialUSB.print("Float max: ");
|
|
SerialUSB.println(fmax);
|
|
}
|
|
|
|
void print_separator(void) {
|
|
SerialUSB.println();
|
|
SerialUSB.println(" ** ");
|
|
SerialUSB.println();
|
|
}
|
|
|
|
// Force init to be called *first*, i.e. before static object allocation.
|
|
// Otherwise, statically allocated objects that need libmaple may fail.
|
|
__attribute__((constructor)) void premain() {
|
|
init();
|
|
}
|
|
|
|
int main(void) {
|
|
setup();
|
|
|
|
while (1) {
|
|
loop();
|
|
}
|
|
return 0;
|
|
}
|