use Serial1 option for debug output (since USB port is taken)

Author: ladyada

libraries/USBHost/examples/USB_desc/USB_desc.ino

@@ -1,22 +1,16 @@
-
-
 #include "Arduino.h"
 #include <usbhub.h>
 #include "wiring_constants.h"
 #include "pgmstrings.h"
-// Satisfy IDE, which only needs to see the include statment in the ino.
-#ifdef dobogusinclude
-#include <spi4teensy3.h>
-#endif
+
+
+// on a zero with debug port, use debug port
+//#define SerialDebug Serial
+
+// on a feather or non-debug Zero, use Serial1 (since USB is taken!)
+#define SerialDebug Serial1
 
 USBHost     usb;
-//USBHub  Hub1(&Usb);
-//USBHub  Hub2(&Usb);
-//USBHub  Hub3(&Usb);
-//USBHub  Hub4(&Usb);
-//USBHub  Hub5(&Usb);
-//USBHub  Hub6(&Usb);
-//USBHub  Hub7(&Usb);
 
 uint32_t next_time;
 
@@ -33,39 +27,40 @@ void PrintAllAddresses(UsbDeviceDefinition *pdev)
 {
     UsbDeviceAddress adr;
     adr.devAddress = pdev->address.devAddress;
-    SERIAL_PORT_MONITOR.print("\r\nAddr:");
-    SERIAL_PORT_MONITOR.print(adr.devAddress, HEX);
-    SERIAL_PORT_MONITOR.print("(");
-    SERIAL_PORT_MONITOR.print(adr.bmHub, HEX);
-    SERIAL_PORT_MONITOR.print(".");
-    SERIAL_PORT_MONITOR.print(adr.bmParent, HEX);
-    SERIAL_PORT_MONITOR.print(".");
-    SERIAL_PORT_MONITOR.print(adr.bmAddress, HEX);
-    SERIAL_PORT_MONITOR.println(")");
+    SerialDebug.print("\r\nAddr:");
+    SerialDebug.print(adr.devAddress, HEX);
+    SerialDebug.print("(");
+    SerialDebug.print(adr.bmHub, HEX);
+    SerialDebug.print(".");
+    SerialDebug.print(adr.bmParent, HEX);
+    SerialDebug.print(".");
+    SerialDebug.print(adr.bmAddress, HEX);
+    SerialDebug.println(")");
 }
 
 void PrintAddress(uint8_t addr)
 {
     UsbDeviceAddress adr;
     adr.devAddress = addr;
-    SERIAL_PORT_MONITOR.print("\r\nADDR:\t");
-    SERIAL_PORT_MONITOR.println(adr.devAddress,HEX);
-    SERIAL_PORT_MONITOR.print("DEV:\t");
-    SERIAL_PORT_MONITOR.println(adr.bmAddress,HEX);
-    SERIAL_PORT_MONITOR.print("PRNT:\t");
-    SERIAL_PORT_MONITOR.println(adr.bmParent,HEX);
-    SERIAL_PORT_MONITOR.print("HUB:\t");
-    SERIAL_PORT_MONITOR.println(adr.bmHub,HEX);
+    SerialDebug.print("\r\nADDR:\t");
+    SerialDebug.println(adr.devAddress,HEX);
+    SerialDebug.print("DEV:\t");
+    SerialDebug.println(adr.bmAddress,HEX);
+    SerialDebug.print("PRNT:\t");
+    SerialDebug.println(adr.bmParent,HEX);
+    SerialDebug.print("HUB:\t");
+    SerialDebug.println(adr.bmHub,HEX);
 }
 
 void setup()
 {
-  SERIAL_PORT_MONITOR.begin( 115200 );
-  while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
-  SERIAL_PORT_MONITOR.println("Start USB Desc");
+  Serial.begin(115200);
+  SerialDebug.begin(115200);
+  SerialDebug.println("Starting USB Descriptor test");
 
+  SerialDebug.println("Initializing USB");
   if (usb.Init() == -1)
-      SERIAL_PORT_MONITOR.println("OSC did not start.");
+      SerialDebug.println("USBhost did not start.");
 
   delay( 20 );
 
@@ -85,7 +80,7 @@ void PrintDescriptors(uint8_t addr)
       printProgStr(Gen_Error_str);
       print_hex( rcode, 8 );
     }
-    SERIAL_PORT_MONITOR.print("\r\n");
+    SerialDebug.print("\r\n");
 
     for (int i=0; i<num_conf; i++)
     {
@@ -95,15 +90,15 @@ void PrintDescriptors(uint8_t addr)
           printProgStr(Gen_Error_str);
           print_hex(rcode, 8);
         }
-        SERIAL_PORT_MONITOR.println("\r\n");
+        SerialDebug.println("\r\n");
     }
 }
 
 void PrintAllDescriptors(UsbDeviceDefinition *pdev)
 {
-    SERIAL_PORT_MONITOR.println("\r\n");
+    SerialDebug.println("\r\n");
     print_hex(pdev->address.devAddress, 8);
-    SERIAL_PORT_MONITOR.println("\r\n--");
+    SerialDebug.println("\r\n--");
     PrintDescriptors( pdev->address.devAddress );
 }
 
@@ -171,37 +166,37 @@ void printhubdescr(uint8_t *descrptr, uint8_t addr)
 
     printProgStr(PSTR("\r\n\r\nHub Descriptor:\r\n"));
     printProgStr(PSTR("bDescLength:\t\t"));
-    SERIAL_PORT_MONITOR.println(pHub->bDescLength, HEX);
+    SerialDebug.println(pHub->bDescLength, HEX);
 
     printProgStr(PSTR("bDescriptorType:\t"));
-    SERIAL_PORT_MONITOR.println(pHub->bDescriptorType, HEX);
+    SerialDebug.println(pHub->bDescriptorType, HEX);
 
     printProgStr(PSTR("bNbrPorts:\t\t"));
-    SERIAL_PORT_MONITOR.println(pHub->bNbrPorts, HEX);
+    SerialDebug.println(pHub->bNbrPorts, HEX);
 
     printProgStr(PSTR("LogPwrSwitchMode:\t"));
-    SERIAL_PORT_MONITOR.println(pHub->LogPwrSwitchMode, BIN);
+    SerialDebug.println(pHub->LogPwrSwitchMode, BIN);
 
     printProgStr(PSTR("CompoundDevice:\t\t"));
-    SERIAL_PORT_MONITOR.println(pHub->CompoundDevice, BIN);
+    SerialDebug.println(pHub->CompoundDevice, BIN);
 
     printProgStr(PSTR("OverCurrentProtectMode:\t"));
-    SERIAL_PORT_MONITOR.println(pHub->OverCurrentProtectMode, BIN);
+    SerialDebug.println(pHub->OverCurrentProtectMode, BIN);
 
     printProgStr(PSTR("TTThinkTime:\t\t"));
-    SERIAL_PORT_MONITOR.println(pHub->TTThinkTime, BIN);
+    SerialDebug.println(pHub->TTThinkTime, BIN);
 
     printProgStr(PSTR("PortIndicatorsSupported:"));
-    SERIAL_PORT_MONITOR.println(pHub->PortIndicatorsSupported, BIN);
+    SerialDebug.println(pHub->PortIndicatorsSupported, BIN);
 
     printProgStr(PSTR("Reserved:\t\t"));
-    SERIAL_PORT_MONITOR.println(pHub->Reserved, HEX);
+    SerialDebug.println(pHub->Reserved, HEX);
 
     printProgStr(PSTR("bPwrOn2PwrGood:\t\t"));
-    SERIAL_PORT_MONITOR.println(pHub->bPwrOn2PwrGood, HEX);
+    SerialDebug.println(pHub->bPwrOn2PwrGood, HEX);
 
     printProgStr(PSTR("bHubContrCurrent:\t"));
-    SERIAL_PORT_MONITOR.println(pHub->bHubContrCurrent, HEX);
+    SerialDebug.println(pHub->bHubContrCurrent, HEX);
 
     for (uint8_t i=7; i<len; i++)
         print_hex(descrptr[i], 8);
@@ -271,7 +266,7 @@ void print_hex(int v, int num_places)
   }
   do {
     digit = ((v >> (num_nibbles-1) * 4)) & 0x0f;
-    SERIAL_PORT_MONITOR.print(digit, HEX);
+    SerialDebug.print(digit, HEX);
   }
   while(--num_nibbles);
 }
@@ -329,7 +324,7 @@ void printHIDdescr( uint8_t* descr_ptr )
     printProgStr(PSTR("\r\nNumb Class Descriptor:\t"));
 	print_hex( ep_ptr->bNumDescriptors, 8 );
     printProgStr(PSTR("\r\nDescriptor Type:\t"));
-	if( ep_ptr->bDescrType == 0x22 ) 
+	if( ep_ptr->bDescrType == 0x22 )
 		printProgStr(PSTR("REPORT DESCRIPTOR"));
 	else
 		print_hex( ep_ptr->bDescrType, 8 );
@@ -386,5 +381,4 @@ void printProgStr(const prog_char str[])
   char c;
   if(!str) return;
   while((c = pgm_read_byte(str++)))
-    SERIAL_PORT_MONITOR.print(c);
-}
+    SerialDebug.print(c);