From ff8524a66874ae7f3d66f53283f6ca181b1c98c7 Mon Sep 17 00:00:00 2001
From: Rob Giseburt <giseburt@gmail.com>
Date: Thu, 15 Dec 2016 09:35:30 -0600
Subject: [PATCH] Cleanup board files, and ensure board_hardware_init gets
 called.

Fixes #200
---
 g2core/board/Archim/board_xio.cpp        | 10 +++-------
 g2core/board/Archim/hardware.cpp         |  1 +
 g2core/board/ArduinoDue/board_xio.cpp    | 14 ++++++--------
 g2core/board/ArduinoDue/board_xio.h      |  5 ++---
 g2core/board/ArduinoDue/hardware.cpp     |  1 +
 g2core/board/G2v9/board_xio.cpp          | 14 ++++++--------
 g2core/board/gquadratic/board_xio.cpp    | 10 +++-------
 g2core/board/gquintic/board_xio.cpp      | 10 +++-------
 g2core/board/printrboardg2/board_xio.cpp | 10 +++-------
 g2core/board/sbv300/board_xio.cpp        | 10 +++-------
 g2core/board/sbv300/hardware.cpp         |  1 +
 11 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/g2core/board/Archim/board_xio.cpp b/g2core/board/Archim/board_xio.cpp
index 87ab4dd3..ca077c05 100644
--- a/g2core/board/Archim/board_xio.cpp
+++ b/g2core/board/Archim/board_xio.cpp
@@ -44,14 +44,10 @@ const Motate::USBSettings_t Motate::USBSettings = {
 
 XIOUSBDevice_t usb;
 
-extern decltype(usb.mixin<0>::Serial)& SerialUSB;
-#if USB_SERIAL_PORTS_EXPOSED == 2
-extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
-#endif
-
-
 decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
-//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#if USB_SERIAL_PORTS_EXPOSED == 2
+decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#endif
 
 MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
 MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
diff --git a/g2core/board/Archim/hardware.cpp b/g2core/board/Archim/hardware.cpp
index 11d740ef..55d553ef 100755
--- a/g2core/board/Archim/hardware.cpp
+++ b/g2core/board/Archim/hardware.cpp
@@ -42,6 +42,7 @@
 
 void hardware_init()
 {
+    board_hardware_init();
 	return;
 }
 
diff --git a/g2core/board/ArduinoDue/board_xio.cpp b/g2core/board/ArduinoDue/board_xio.cpp
index 7f2a0774..15639e6a 100755
--- a/g2core/board/ArduinoDue/board_xio.cpp
+++ b/g2core/board/ArduinoDue/board_xio.cpp
@@ -44,14 +44,10 @@ const Motate::USBSettings_t Motate::USBSettings = {
 
 XIOUSBDevice_t usb;
 
-extern decltype(usb.mixin<0>::Serial)& SerialUSB;
-#if USB_SERIAL_PORTS_EXPOSED == 2
-extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
-#endif
-
-
 decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
-//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#if USB_SERIAL_PORTS_EXPOSED == 2
+decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#endif
 
 MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
 MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
@@ -74,8 +70,10 @@ Motate::UART<Motate::kSerial_RXPinNumber, Motate::kSerial_TXPinNumber, Motate::k
 
 void board_hardware_init(void)  // called 1st
 {
+#if XIO_HAS_USB
     // Init USB
-    usb.attach();  // USB setup. Runs in "background" as the rest of this executes
+    usb.attach();                   // USB setup. Runs in "background" as the rest of this executes
+#endif // XIO_HAS_USB
 }
 
 
diff --git a/g2core/board/ArduinoDue/board_xio.h b/g2core/board/ArduinoDue/board_xio.h
index 31afd8c8..09f20fef 100755
--- a/g2core/board/ArduinoDue/board_xio.h
+++ b/g2core/board/ArduinoDue/board_xio.h
@@ -63,9 +63,8 @@ extern Motate::SPI<Motate::kSocket4_SPISlaveSelectPinNumber> spi;
 extern Motate::UART<Motate::kSerial_RXPinNumber, Motate::kSerial_TXPinNumber, Motate::kSerial_RTSPinNumber, Motate::kSerial_CTSPinNumber> Serial;
 #endif
 
-
-
 //******* Generic Functions *******
-void board_xio_init(void);
+void board_hardware_init(void);  // called 1st
+void board_xio_init(void);       // called later
 
 #endif  // board_xio_h
diff --git a/g2core/board/ArduinoDue/hardware.cpp b/g2core/board/ArduinoDue/hardware.cpp
index c688872a..e4886882 100755
--- a/g2core/board/ArduinoDue/hardware.cpp
+++ b/g2core/board/ArduinoDue/hardware.cpp
@@ -44,6 +44,7 @@
 
 void hardware_init()
 {
+    board_hardware_init();
 	return;
 }
 
diff --git a/g2core/board/G2v9/board_xio.cpp b/g2core/board/G2v9/board_xio.cpp
index 09ccaf80..710433dc 100755
--- a/g2core/board/G2v9/board_xio.cpp
+++ b/g2core/board/G2v9/board_xio.cpp
@@ -44,14 +44,10 @@ const Motate::USBSettings_t Motate::USBSettings = {
 
 XIOUSBDevice_t usb;
 
-extern decltype(usb.mixin<0>::Serial)& SerialUSB;
-#if USB_SERIAL_PORTS_EXPOSED == 2
-extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
-#endif
-
-
 decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
-//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#if USB_SERIAL_PORTS_EXPOSED == 2
+decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#endif
 
 MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
 MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
@@ -73,8 +69,10 @@ Motate::UART<Motate::kSerial_RXPinNumber, Motate::kSerial_TXPinNumber, Motate::k
 
 void board_hardware_init(void)  // called 1st
 {
+#if XIO_HAS_USB
     // Init USB
-    usb.attach();  // USB setup. Runs in "background" as the rest of this executes
+    usb.attach();                   // USB setup. Runs in "background" as the rest of this executes
+#endif // XIO_HAS_USB
 }
 
 
diff --git a/g2core/board/gquadratic/board_xio.cpp b/g2core/board/gquadratic/board_xio.cpp
index 8b4835b2..c48356be 100755
--- a/g2core/board/gquadratic/board_xio.cpp
+++ b/g2core/board/gquadratic/board_xio.cpp
@@ -44,14 +44,10 @@ const Motate::USBSettings_t Motate::USBSettings = {
 
 XIOUSBDevice_t usb;
 
-extern decltype(usb.mixin<0>::Serial)& SerialUSB;
-#if USB_SERIAL_PORTS_EXPOSED == 2
-extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
-#endif
-
-
 decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
-//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#if USB_SERIAL_PORTS_EXPOSED == 2
+decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#endif
 
 MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
 MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
diff --git a/g2core/board/gquintic/board_xio.cpp b/g2core/board/gquintic/board_xio.cpp
index 8b4835b2..c48356be 100755
--- a/g2core/board/gquintic/board_xio.cpp
+++ b/g2core/board/gquintic/board_xio.cpp
@@ -44,14 +44,10 @@ const Motate::USBSettings_t Motate::USBSettings = {
 
 XIOUSBDevice_t usb;
 
-extern decltype(usb.mixin<0>::Serial)& SerialUSB;
-#if USB_SERIAL_PORTS_EXPOSED == 2
-extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
-#endif
-
-
 decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
-//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#if USB_SERIAL_PORTS_EXPOSED == 2
+decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#endif
 
 MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
 MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
diff --git a/g2core/board/printrboardg2/board_xio.cpp b/g2core/board/printrboardg2/board_xio.cpp
index 8b4835b2..c48356be 100755
--- a/g2core/board/printrboardg2/board_xio.cpp
+++ b/g2core/board/printrboardg2/board_xio.cpp
@@ -44,14 +44,10 @@ const Motate::USBSettings_t Motate::USBSettings = {
 
 XIOUSBDevice_t usb;
 
-extern decltype(usb.mixin<0>::Serial)& SerialUSB;
-#if USB_SERIAL_PORTS_EXPOSED == 2
-extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
-#endif
-
-
 decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
-//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#if USB_SERIAL_PORTS_EXPOSED == 2
+decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#endif
 
 MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
 MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
diff --git a/g2core/board/sbv300/board_xio.cpp b/g2core/board/sbv300/board_xio.cpp
index 8b4835b2..c48356be 100755
--- a/g2core/board/sbv300/board_xio.cpp
+++ b/g2core/board/sbv300/board_xio.cpp
@@ -44,14 +44,10 @@ const Motate::USBSettings_t Motate::USBSettings = {
 
 XIOUSBDevice_t usb;
 
-extern decltype(usb.mixin<0>::Serial)& SerialUSB;
-#if USB_SERIAL_PORTS_EXPOSED == 2
-extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
-#endif
-
-
 decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
-//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#if USB_SERIAL_PORTS_EXPOSED == 2
+decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
+#endif
 
 MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
 MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
diff --git a/g2core/board/sbv300/hardware.cpp b/g2core/board/sbv300/hardware.cpp
index 7fbf23b7..ee0cf7fd 100755
--- a/g2core/board/sbv300/hardware.cpp
+++ b/g2core/board/sbv300/hardware.cpp
@@ -43,6 +43,7 @@
 
 void hardware_init()
 {
+    board_hardware_init();
 	return;
 }