Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-23 04:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #201 from synthetos/dev-200-usb-not-attached

Browse Source 
Cleanup board files, and ensure board_hardware_init gets called.
This commit is contained in:
Rob Giseburt
2016-12-15 09:40:05 -06:00
committed by GitHub
parent 42e3289f0e ff8524a668
commit 9c28936e4d
11 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/board/Archim/board_xio.cpp
+3 -7
View File
@@ -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" )
g2core/board/Archim/hardware.cpp
+1
View File
@@ -42,6 +42,7 @@
void hardware_init()
{
board_hardware_init();
return;
}
g2core/board/ArduinoDue/board_xio.cpp
+6 -8
View File
@@ -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
}
g2core/board/ArduinoDue/board_xio.h
+2 -3
View File
@@ -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
g2core/board/ArduinoDue/hardware.cpp
+1
View File
@@ -44,6 +44,7 @@
void hardware_init()
{
board_hardware_init();
return;
}
g2core/board/G2v9/board_xio.cpp
+6 -8
View File
@@ -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
}
g2core/board/gquadratic/board_xio.cpp
+3 -7
View File
@@ -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" )
g2core/board/gquintic/board_xio.cpp
+3 -7
View File
@@ -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" )
g2core/board/printrboardg2/board_xio.cpp
+3 -7
View File
@@ -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" )
g2core/board/sbv300/board_xio.cpp
+3 -7
View File
@@ -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" )
g2core/board/sbv300/hardware.cpp
+1
View File
@@ -43,6 +43,7 @@
void hardware_init()
{
board_hardware_init();
return;
}