Skip to content

Commit 9c28936

Browse files
giseburtgiseburt
authored
Merge pull request #201 from synthetos/dev-200-usb-not-attached
Cleanup board files, and ensure board_hardware_init gets called.
2 parents 42e3289 + ff8524a commit 9c28936

File tree

11 files changed

+25
-47
lines changed

11 files changed

+25
-47
lines changed

‎g2core/board/Archim/board_xio.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ const Motate::USBSettings_t Motate::USBSettings = {
4444

4545
XIOUSBDevice_t usb;
4646

47-
extern decltype(usb.mixin<0>::Serial)& SerialUSB;
47+
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
4848
#if USB_SERIAL_PORTS_EXPOSED == 2
49-
extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
49+
decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
5050
#endif
5151

52-
53-
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
54-
//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
55-
5652
MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
5753
MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
5854
MOTATE_SET_USB_SERIAL_NUMBER_STRING_FROM_CHIPID()

‎g2core/board/Archim/hardware.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
void hardware_init()
4444
{
45+
board_hardware_init();
4546
return;
4647
}
4748

‎g2core/board/ArduinoDue/board_xio.cpp

+5-7
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ const Motate::USBSettings_t Motate::USBSettings = {
4444

4545
XIOUSBDevice_t usb;
4646

47-
extern decltype(usb.mixin<0>::Serial)& SerialUSB;
47+
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
4848
#if USB_SERIAL_PORTS_EXPOSED == 2
49-
extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
49+
decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
5050
#endif
5151

52-
53-
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
54-
//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
55-
5652
MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
5753
MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
5854
MOTATE_SET_USB_SERIAL_NUMBER_STRING_FROM_CHIPID()
@@ -74,8 +70,10 @@ Motate::UART<Motate::kSerial_RXPinNumber, Motate::kSerial_TXPinNumber, Motate::k
7470

7571
void board_hardware_init(void) // called 1st
7672
{
73+
#if XIO_HAS_USB
7774
// Init USB
78-
usb.attach(); // USB setup. Runs in "background" as the rest of this executes
75+
usb.attach(); // USB setup. Runs in "background" as the rest of this executes
76+
#endif // XIO_HAS_USB
7977
}
8078

8179

‎g2core/board/ArduinoDue/board_xio.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ extern Motate::SPI<Motate::kSocket4_SPISlaveSelectPinNumber> spi;
6363
extern Motate::UART<Motate::kSerial_RXPinNumber, Motate::kSerial_TXPinNumber, Motate::kSerial_RTSPinNumber, Motate::kSerial_CTSPinNumber> Serial;
6464
#endif
6565

66-
67-
6866
//******* Generic Functions *******
69-
void board_xio_init(void);
67+
void board_hardware_init(void); // called 1st
68+
void board_xio_init(void); // called later
7069

7170
#endif // board_xio_h

‎g2core/board/ArduinoDue/hardware.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
void hardware_init()
4646
{
47+
board_hardware_init();
4748
return;
4849
}
4950

‎g2core/board/G2v9/board_xio.cpp

+5-7
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ const Motate::USBSettings_t Motate::USBSettings = {
4444

4545
XIOUSBDevice_t usb;
4646

47-
extern decltype(usb.mixin<0>::Serial)& SerialUSB;
47+
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
4848
#if USB_SERIAL_PORTS_EXPOSED == 2
49-
extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
49+
decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
5050
#endif
5151

52-
53-
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
54-
//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
55-
5652
MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
5753
MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
5854
MOTATE_SET_USB_SERIAL_NUMBER_STRING_FROM_CHIPID()
@@ -73,8 +69,10 @@ Motate::UART<Motate::kSerial_RXPinNumber, Motate::kSerial_TXPinNumber, Motate::k
7369

7470
void board_hardware_init(void) // called 1st
7571
{
72+
#if XIO_HAS_USB
7673
// Init USB
77-
usb.attach(); // USB setup. Runs in "background" as the rest of this executes
74+
usb.attach(); // USB setup. Runs in "background" as the rest of this executes
75+
#endif // XIO_HAS_USB
7876
}
7977

8078

‎g2core/board/gquadratic/board_xio.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ const Motate::USBSettings_t Motate::USBSettings = {
4444

4545
XIOUSBDevice_t usb;
4646

47-
extern decltype(usb.mixin<0>::Serial)& SerialUSB;
47+
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
4848
#if USB_SERIAL_PORTS_EXPOSED == 2
49-
extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
49+
decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
5050
#endif
5151

52-
53-
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
54-
//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
55-
5652
MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
5753
MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
5854
MOTATE_SET_USB_SERIAL_NUMBER_STRING_FROM_CHIPID()

‎g2core/board/gquintic/board_xio.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ const Motate::USBSettings_t Motate::USBSettings = {
4444

4545
XIOUSBDevice_t usb;
4646

47-
extern decltype(usb.mixin<0>::Serial)& SerialUSB;
47+
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
4848
#if USB_SERIAL_PORTS_EXPOSED == 2
49-
extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
49+
decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
5050
#endif
5151

52-
53-
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
54-
//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
55-
5652
MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
5753
MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
5854
MOTATE_SET_USB_SERIAL_NUMBER_STRING_FROM_CHIPID()

‎g2core/board/printrboardg2/board_xio.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ const Motate::USBSettings_t Motate::USBSettings = {
4444

4545
XIOUSBDevice_t usb;
4646

47-
extern decltype(usb.mixin<0>::Serial)& SerialUSB;
47+
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
4848
#if USB_SERIAL_PORTS_EXPOSED == 2
49-
extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
49+
decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
5050
#endif
5151

52-
53-
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
54-
//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
55-
5652
MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
5753
MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
5854
MOTATE_SET_USB_SERIAL_NUMBER_STRING_FROM_CHIPID()

‎g2core/board/sbv300/board_xio.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ const Motate::USBSettings_t Motate::USBSettings = {
4444

4545
XIOUSBDevice_t usb;
4646

47-
extern decltype(usb.mixin<0>::Serial)& SerialUSB;
47+
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
4848
#if USB_SERIAL_PORTS_EXPOSED == 2
49-
extern decltype(usb.mixin<1>::Serial)& SerialUSB1;
49+
decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
5050
#endif
5151

52-
53-
decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial;
54-
//decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
55-
5652
MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" )
5753
MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" )
5854
MOTATE_SET_USB_SERIAL_NUMBER_STRING_FROM_CHIPID()

‎g2core/board/sbv300/hardware.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
void hardware_init()
4545
{
46+
board_hardware_init();
4647
return;
4748
}
4849

0 commit comments

Comments
 (0)