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>
127 lines
3.8 KiB
C++
127 lines
3.8 KiB
C++
// Tests SerialUSB functionality.
|
|
|
|
#include <wirish/wirish.h>
|
|
#include "usb_cdcacm.h"
|
|
|
|
#define QUICKPRINT 0
|
|
#define BIGSTUFF 1
|
|
#define NUMBERS 2
|
|
#define SIMPLE 3
|
|
#define ONOFF 4
|
|
|
|
uint32 state = 0;
|
|
|
|
void setup() {
|
|
/* Set up the LED to blink */
|
|
pinMode(BOARD_LED_PIN, OUTPUT);
|
|
|
|
/* Set up Serial2 for use as a debug channel */
|
|
Serial2.begin(9600);
|
|
Serial2.println("This is the debug channel. Press any key.");
|
|
while (!Serial2.available())
|
|
;
|
|
Serial2.read();
|
|
}
|
|
|
|
uint8 c1 = '-';
|
|
|
|
void loop() {
|
|
toggleLED();
|
|
delay(1000);
|
|
|
|
if (Serial2.available()) {
|
|
Serial2.read();
|
|
state++;
|
|
}
|
|
|
|
switch (state) {
|
|
case QUICKPRINT:
|
|
for (int i = 0; i < 30; i++) {
|
|
usb_cdcacm_putc((char)c1, 1);
|
|
SerialUSB.print('.');
|
|
SerialUSB.print('|');
|
|
}
|
|
Serial2.println(SerialUSB.pending(), DEC);
|
|
SerialUSB.println();
|
|
break;
|
|
case BIGSTUFF:
|
|
SerialUSB.println("0123456789012345678901234567890123456789"
|
|
"0123456789012345678901234567890123456789"
|
|
"012345678901234567890");
|
|
SerialUSB.println((int64)123456789, DEC);
|
|
SerialUSB.println(3.1415926535);
|
|
Serial2.println(SerialUSB.pending(), DEC);
|
|
break;
|
|
case NUMBERS:
|
|
SerialUSB.println("Numbers! -----------------------------");
|
|
Serial2.println("Numbers! -----------------------------");
|
|
SerialUSB.println('1');
|
|
Serial2.println('1');
|
|
SerialUSB.println(1, DEC);
|
|
Serial2.println(1, DEC);
|
|
SerialUSB.println(-1, DEC);
|
|
Serial2.println(-1, DEC);
|
|
SerialUSB.println(3.14159265);
|
|
Serial2.println(3.14159265);
|
|
SerialUSB.println(123456789, DEC);
|
|
Serial2.println(123456789, DEC);
|
|
SerialUSB.println(-123456789, DEC);
|
|
Serial2.println(-123456789, DEC);
|
|
SerialUSB.println(65535, HEX);
|
|
Serial2.println(65535, HEX);
|
|
break;
|
|
case SIMPLE:
|
|
Serial2.println("Trying write('a')");
|
|
SerialUSB.write('a');
|
|
Serial2.println("Trying write(\"b\")");
|
|
SerialUSB.write("b");
|
|
Serial2.println("Trying print('c')");
|
|
SerialUSB.print('c');
|
|
Serial2.println("Trying print(\"d\")");
|
|
SerialUSB.print("d");
|
|
Serial2.println("Trying print(\"efg\")");
|
|
SerialUSB.print("efg");
|
|
Serial2.println("Trying println(\"hij\\n\\r\")");
|
|
SerialUSB.print("hij\n\r");
|
|
SerialUSB.write(' ');
|
|
SerialUSB.println();
|
|
Serial2.println("Trying println(123456789, DEC)");
|
|
SerialUSB.println(123456789, DEC);
|
|
Serial2.println("Trying println(3.141592)");
|
|
SerialUSB.println(3.141592);
|
|
Serial2.println("Trying println(\"DONE\")");
|
|
SerialUSB.println("DONE");
|
|
break;
|
|
case ONOFF:
|
|
Serial2.println("Shutting down...");
|
|
SerialUSB.println("Shutting down...");
|
|
SerialUSB.end();
|
|
Serial2.println("Waiting 4 seconds...");
|
|
delay(4000);
|
|
Serial2.println("Starting up...");
|
|
SerialUSB.begin();
|
|
SerialUSB.println("Hello World!");
|
|
Serial2.println("Waiting 4 seconds...");
|
|
delay(4000);
|
|
state++;
|
|
break;
|
|
default:
|
|
state = 0;
|
|
}
|
|
}
|
|
|
|
// 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 (true) {
|
|
loop();
|
|
}
|
|
return 0;
|
|
}
|