1 files changed, 40 insertions, 49 deletions

diff --git a/examples/test-serialusb.cpp b/examples/test-serialusb.cpp
index 9d0a862..15ab913 100644
--- a/examples/test-serialusb.cpp
+++ b/examples/test-serialusb.cpp
@@ -1,81 +1,74 @@
-// Sample main.cpp file. Blinks an LED, sends a message out USART2
-// and turns on PWM on pin 2
+// Tests SerialUSB functionality.
 
 #include "wirish.h"
 #include "usb.h"
 
-#define LED_PIN 13
-#define BUT_PIN 38
-
-uint32 state = 0;
 #define QUICKPRINT  0
 #define BIGSTUFF    1
 #define NUMBERS     2
 #define SIMPLE      3
 #define ONOFF       4
 
+uint32 state = 0;
 
-void setup()
-{
+void setup() {
     /* Set up the LED to blink  */
-    pinMode(LED_PIN, OUTPUT);
-
-    /* Set up the Button */
-    pinMode(BUT_PIN, INPUT_PULLUP);
+    pinMode(BOARD_LED_PIN, OUTPUT);
 
+    /* Set up Serial2 for use as a debug channel */
     Serial2.begin(9600);
-    Serial2.println("Hello world! This is the debug channel.");
+    Serial2.println("This is the debug channel. Press any key.");
+    while (!Serial2.available())
+        ;
+    Serial2.read();
 }
 
-int toggle = 0;
-
 uint8 c1 = '-';
 
 void loop() {
-    toggle ^= 1;
-    digitalWrite(LED_PIN, toggle);
+    toggleLED();
     delay(1000);
 
-    if(digitalRead(BUT_PIN)) {
-        while(digitalRead(BUT_PIN)) {};
+    if (Serial2.available()) {
+        Serial2.read();
         state++;
     }
-    
-    switch(state) {
+
+    switch (state) {
         case QUICKPRINT:
-            for(int i = 0; i<30; i++) {
-                usbSendBytes(&c1,1);
+            for (int i = 0; i < 30; i++) {
+                usbSendBytes(&c1, 1);
                 SerialUSB.print('.');
                 SerialUSB.print('|');
             }
-            Serial2.println(SerialUSB.pending(),DEC);
+            Serial2.println(SerialUSB.pending(), DEC);
             SerialUSB.println();
             break;
         case BIGSTUFF:
-            SerialUSB.println("01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
-            SerialUSB.println((uint32)123456789,DEC);
+            SerialUSB.println("0123456789012345678901234567890123456789"
+                              "0123456789012345678901234567890123456789"
+                              "012345678901234567890");
+            SerialUSB.println((int64)123456789, DEC);
             SerialUSB.println(3.1415926535);
-            Serial2.println(SerialUSB.pending(),DEC);
+            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(1, DEC);
+            Serial2.println(1, DEC);
+            SerialUSB.println(-1, DEC);
+            Serial2.println(-1, DEC);
             SerialUSB.println(3.14159265);
             Serial2.println(3.14159265);
-            SerialUSB.println(3.14159265,9);
-            Serial2.println(3.14159265,9);
-            SerialUSB.println(123456789,DEC);
-            Serial2.println(123456789,DEC);
-            SerialUSB.println(-123456789,DEC);
-            Serial2.println(-123456789,DEC);
-            SerialUSB.println(65535,HEX);
-            Serial2.println(65535,HEX);
+            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')");
@@ -92,8 +85,8 @@ void loop() {
             SerialUSB.print("hij\n\r");
             SerialUSB.write(' ');
             SerialUSB.println();
-            Serial2.println("Trying println(123456789,DEC)");
-            SerialUSB.println(123456789);
+            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\")");
@@ -103,12 +96,12 @@ void loop() {
             Serial2.println("Shutting down...");
             SerialUSB.println("Shutting down...");
             SerialUSB.end();
-            Serial2.println("Waiting 4seconds...");
+            Serial2.println("Waiting 4 seconds...");
             delay(4000);
             Serial2.println("Starting up...");
             SerialUSB.begin();
             SerialUSB.println("Hello World!");
-            Serial2.println("Waiting 4seconds...");
+            Serial2.println("Waiting 4 seconds...");
             delay(4000);
             state++;
             break;
@@ -118,18 +111,16 @@ void loop() {
 }
 
 // Force init to be called *first*, i.e. before static object allocation.
-// Otherwise, statically allocated object that need libmaple may fail.
- __attribute__(( constructor )) void premain() {
+// Otherwise, statically allocated objects that need libmaple may fail.
+__attribute__((constructor)) void premain() {
     init();
 }
 
-int main(void)
-{
+int main(void) {
     setup();
 
-    while (1) {
+    while (true) {
         loop();
     }
     return 0;
 }
-