diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-05-09 16:35:13 -0400 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-05-09 16:40:58 -0400 |
commit | 868fb1c273e562a1140abfa948022c9d4f55bccf (patch) | |
tree | 73067aa8cf6f8bd0d7663a634c1f878a78b567ed /examples/test-serial-flush.cpp | |
parent | 47c53377292a4db28057fc6394c928cde3727e97 (diff) | |
download | librambutan-868fb1c273e562a1140abfa948022c9d4f55bccf.tar.gz librambutan-868fb1c273e562a1140abfa948022c9d4f55bccf.zip |
Reverting commits between `git merge-head master refactor` and master.
This is a combination of 11 revert commits, and allows for a clean
merge of the work done in the refactor branch.
The combined commit messages follow.
Revert "Committing basic ring_buffer test."
This reverts commit 987fa5f433e0cd41b1621dad8b4e331cf82d49f3.
Revert "qa-slave-shield.cpp and test-session.cpp fixes for Mini and RET6 Edition."
This reverts commit cdd367bdd264c9e19180032c119850fbba2115ba.
Revert "Brought examples/ up to date; PIN_MAP bugfix for D24."
This reverts commit b4c2d4514c6d52cac8a649c5d5c24b68a3c0a416.
Revert "Separated GPIO config to a separate FSMC routine."
This reverts commit 744848ad0fc33eed66acc44e41c3c9d646c5b100.
Revert "Slightly faster RAM writes (6.5MHz)."
This reverts commit 8ba0b6bb065acb4aff26bc9c838de5f37515caf1.
Revert "FSMC working but slow (~6 MHz)."
This reverts commit 0dc9490cf4f4f10a23b08fef1728773f10c1b76a.
Revert "Maple Mini ERROR_LED_PIN fix."
This reverts commit 07d437706840901db1e09ff0ab88229c67c1fa8a.
Revert "Fixing USBSerial::read(void*, uint32) return value (thanks, Crenn!)"
This reverts commit 3ba7196712a5bfe4fe1166b6c34d49c3d7254568.
Revert "Trivial gpio_init() bugfix"
This reverts commit f6ce003bb935f26eeefa54acf7c2ae6afaabd871.
Revert "Trivial changes to test-session.cpp"
This reverts commit a32a37b121ac7e62660d2a83fe67c857fe705122.
Revert ".gitignore: Ignore cscope* files"
This reverts commit d8c72c17bd6d7416a0846e69f4f5ae5cb229d58e.
Diffstat (limited to 'examples/test-serial-flush.cpp')
-rw-r--r-- | examples/test-serial-flush.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/examples/test-serial-flush.cpp b/examples/test-serial-flush.cpp index 1cd82b6..d7fbf7a 100644 --- a/examples/test-serial-flush.cpp +++ b/examples/test-serial-flush.cpp @@ -2,13 +2,22 @@ #include "wirish.h" -void setup() { +void setup() +{ /* Send a message out USART2 */ Serial2.begin(9600); Serial2.println("Hello world!"); } +int toggle = 0; + void loop() { + + Serial2.println("This is the first line."); + Serial2.end(); + Serial2.println("This is the second line."); + + Serial2.begin(9600); Serial2.println("Waiting for multiple input..."); while(Serial2.available() < 5) { } Serial2.println(Serial2.read()); @@ -20,12 +29,13 @@ void loop() { } // 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() { +// Otherwise, statically allocated object that need libmaple may fail. + __attribute__(( constructor )) void premain() { init(); } -int main(void) { +int main(void) +{ setup(); while (1) { |