From e2ba062f8c6533dc656ef06a88527eb94b9297f0 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Fri, 28 Oct 2016 21:33:54 -0500 Subject: [PATCH] Fixes for Archim, fixed kSerial_(RX|TX|RTS|CTS)PinNumber constant naming on all boards. --- g2core/board/Archim.mk | 2 +- g2core/board/Archim/Archim-pinout.h | 16 +++--- g2core/board/Archim/board_xio.cpp | 57 +++++++++++-------- g2core/board/Archim/board_xio.h | 23 ++++---- g2core/board/Archim/hardware.cpp | 49 +++++++++++++--- g2core/board/ArduinoDue/board_xio.cpp | 4 +- g2core/board/ArduinoDue/board_xio.h | 2 +- g2core/board/ArduinoDue/gShield-pinout.h | 8 +-- .../board/ArduinoDue/shopbotShield-pinout.h | 4 +- g2core/board/G2v9/board_xio.cpp | 4 +- g2core/board/G2v9/board_xio.h | 2 +- g2core/board/G2v9/motate_pin_assignments.h | 8 +-- g2core/board/gquadratic/board_xio.cpp | 4 +- g2core/board/gquadratic/board_xio.h | 2 +- g2core/board/gquadratic/gquadratic-b-pinout.h | 8 +-- .../board/gquadratic/motate_pin_assignments.h | 18 +++--- g2core/board/gquintic/board_xio.cpp | 4 +- g2core/board/gquintic/board_xio.h | 2 +- g2core/board/gquintic/gquintic-b-pinout.h | 8 +-- .../board/gquintic/motate_pin_assignments.h | 16 +++--- g2core/board/printrboardg2/board_xio.cpp | 4 +- g2core/board/printrboardg2/board_xio.h | 2 +- .../printrboardg2/motate_pin_assignments.h | 8 +-- .../printrboardg2/printrboardG2v3-pinout.h | 8 +-- g2core/board/sbv300/board_xio.cpp | 4 +- g2core/board/sbv300/board_xio.h | 2 +- g2core/board/sbv300/motate_pin_assignments.h | 8 +-- 27 files changed, 159 insertions(+), 118 deletions(-) diff --git a/g2core/board/Archim.mk b/g2core/board/Archim.mk index bf8bb2c8..7a2c46ae 100755 --- a/g2core/board/Archim.mk +++ b/g2core/board/Archim.mk @@ -33,7 +33,7 @@ ifeq ("$(BASE_BOARD)","archim") CHIP_LOWERCASE = sam3x8e BOARD_PATH = ./board/Archim - SOURCE_DIRS += ${BOARD_PATH} + SOURCE_DIRS += ${BOARD_PATH} device/step_dir_driver PLATFORM_BASE = ${MOTATE_PATH}/platform/atmel_sam diff --git a/g2core/board/Archim/Archim-pinout.h b/g2core/board/Archim/Archim-pinout.h index 4bab1531..1d49ac1a 100755 --- a/g2core/board/Archim/Archim-pinout.h +++ b/g2core/board/Archim/Archim-pinout.h @@ -84,15 +84,15 @@ namespace Motate { // NOT ALL OF THESE PINS ARE ON ALL PLATFORMS // Undefined pins will be equivalent to Motate::NullPin, and return 1 for Pin<>::isNull(); -pin_number kSerial_RX = 0; -pin_number kSerial_TX = 1; -// pin_number kSerial_RTS = 8; // added later -// pin_number kSerial_CTS = 9; // added later +pin_number kSerial_RXPinNumber = 0; +pin_number kSerial_TXPinNumber = 1; +pin_number kSerial_RTSPinNumber = 2; // added later +pin_number kSerial_CTSPinNumber = 3; // added later -pin_number kSerial0_RX = 0; -pin_number kSerial0_TX = 1; -// pin_number kSerial0_RTS = 8; // added later -// pin_number kSerial0_CTS = 9; // added later +pin_number kSerial0_RXPinNumber = 0; +pin_number kSerial0_TXPinNumber = 1; +pin_number kSerial0_RTSPinNumber = 2; // added later +pin_number kSerial0_CTSPinNumber = 3; // added later pin_number kI2C_SDAPinNumber = 20; pin_number kI2C_SCLPinNumber = 21; diff --git a/g2core/board/Archim/board_xio.cpp b/g2core/board/Archim/board_xio.cpp index 0e6ce2b1..ff0846e1 100755 --- a/g2core/board/Archim/board_xio.cpp +++ b/g2core/board/Archim/board_xio.cpp @@ -32,48 +32,59 @@ #include "board_xio.h" //******** USB ******** +#if XIO_HAS_USB const Motate::USBSettings_t Motate::USBSettings = { /*gVendorID = */ 0x1d50, /*gProductID = */ 0x606d, /*gProductVersion = */ G2CORE_FIRMWARE_VERSION, /*gAttributes = */ kUSBConfigAttributeSelfPowered, - /*gPowerConsumption = */ 500}; -/*gProductVersion = */ // 0.1, + /*gPowerConsumption = */ 500 +}; +/*gProductVersion = */ //0.1, -// Motate::USBDevice< Motate::USBCDC > usb; -Motate::USBDevice usb; +//Motate::USBDevice< Motate::USBCDC > usb; +Motate::USBDevice< Motate::USBCDC, Motate::USBCDC > usb; -decltype(usb.mixin<0>::Serial)& SerialUSB = usb.mixin<0>::Serial; -decltype(usb.mixin<1>::Serial)& SerialUSB1 = usb.mixin<1>::Serial; +decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial; +decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial; // 115200 is the default, as well. -// UART Serial {115200, UARTMode::RTSCTSFlowControl}; +//UART Serial {115200, UARTMode::RTSCTSFlowControl}; - -MOTATE_SET_USB_VENDOR_STRING({'S', 'y', 'n', 't', 'h', 'e', 't', 'o', 's'}) -MOTATE_SET_USB_PRODUCT_STRING({'T', 'i', 'n', 'y', 'G', ' ', 'v', '2'}) +MOTATE_SET_USB_VENDOR_STRING( u"Synthetos (http://synthetos.com)" ) +MOTATE_SET_USB_PRODUCT_STRING( u"g2core gQuadratic" ) MOTATE_SET_USB_SERIAL_NUMBER_STRING_FROM_CHIPID() - - +#endif // XIO_HAS_USB //******** SPI ******** -// Motate::SPI spi; - +#if XIO_HAS_SPI +Motate::SPI spi; +#endif //******** UART ******** -// Motate::UART Serial {115200, -// Motate::UARTMode::RTSCTSFlowControl}; +#if XIO_HAS_UART +Motate::UART Serial {115200, Motate::UARTMode::RTSCTSFlowControl}; +#endif - - -void board_xio_init(void) { +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 +} - // Init SPI (handled internally for now) +void board_xio_init(void) // called later than board_hardware_init (there are thing in between) +{ + // Init SPI +#if XIO_HAS_SPI + // handled internally for now +#endif // Init UART - // Serial.init(); -} \ No newline at end of file +#if XIO_HAS_UART + Serial.init(); +#endif +} diff --git a/g2core/board/Archim/board_xio.h b/g2core/board/Archim/board_xio.h index d40e88b3..102698d3 100755 --- a/g2core/board/Archim/board_xio.h +++ b/g2core/board/Archim/board_xio.h @@ -30,6 +30,7 @@ #define board_xio_h //******** USB ******** +#if XIO_HAS_USB #include "MotateUSB.h" #include "MotateUSBCDC.h" @@ -37,23 +38,23 @@ extern Motate::USBDevice usb; extern decltype(usb.mixin<0>::Serial)& SerialUSB; extern decltype(usb.mixin<1>::Serial)& SerialUSB1; - +#endif // XIO_HAS_USB //******** SPI ******** -//#include "MotateSPI.h" -// extern Motate::SPI spi; - - +#if XIO_HAS_SPI +#include "MotateSPI.h" +extern Motate::SPI spi; +#endif //******** UART ******** -#define XIO_HAS_UART 0 -//#include "MotateUART.h" -// extern Motate::UART Serial; - - +#if XIO_HAS_UART +#include "MotateUART.h" +extern Motate::UART 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/Archim/hardware.cpp b/g2core/board/Archim/hardware.cpp index 19731b3a..11d740ef 100755 --- a/g2core/board/Archim/hardware.cpp +++ b/g2core/board/Archim/hardware.cpp @@ -55,6 +55,15 @@ void hw_hard_reset(void) Motate::System::reset(/*boootloader: */ false); // arg=0 resets the system } +/* + * hardware_periodic() - callback from the controller loop - TIME CRITICAL. + */ + +stat_t hardware_periodic() +{ + return STAT_OK; +} + void hw_flash_loader(void) { Motate::System::reset(/*boootloader: */ true); // arg=1 erases FLASH and enters FLASH loader @@ -89,7 +98,27 @@ void _get_id(char *id) stat_t hw_get_fbs(nvObj_t *nv) { nv->valuetype = TYPE_STRING; - ritorno(nv_copy_string(nv, "build")); + ritorno(nv_copy_string(nv, G2CORE_FIRMWARE_BUILD_STRING)); + return (STAT_OK); +} + +/* + * hw_get_fbc() - get configuration settings file + */ + +stat_t hw_get_fbc(nvObj_t *nv) +{ + nv->valuetype = TYPE_STRING; +#ifdef SETTINGS_FILE +#define settings_file_string1(s) #s +#define settings_file_string2(s) settings_file_string1(s) + ritorno(nv_copy_string(nv, settings_file_string2(SETTINGS_FILE))); +#undef settings_file_string1 +#undef settings_file_string2 +#else + ritorno(nv_copy_string(nv, "")); +#endif + return (STAT_OK); } @@ -131,20 +160,22 @@ stat_t hw_set_hv(nvObj_t *nv) #ifdef __TEXT_MODE -static const char fmt_fb[] = "[fb] firmware build%18.2f\n"; -static const char fmt_fbs[] = "[fbs] firmware build \"%32s\"\n"; +static const char fmt_fb[] = "[fb] firmware build %18.2f\n"; +static const char fmt_fbs[] = "[fbs] firmware build \"%s\"\n"; +static const char fmt_fbc[] = "[fbc] firmware config \"%s\"\n"; static const char fmt_fv[] = "[fv] firmware version%16.2f\n"; static const char fmt_cv[] = "[cv] configuration version%11.2f\n"; static const char fmt_hp[] = "[hp] hardware platform%15.2f\n"; static const char fmt_hv[] = "[hv] hardware version%16.2f\n"; static const char fmt_id[] = "[id] g2core ID%21s\n"; -void hw_print_fb(nvObj_t *nv) { text_print(nv, fmt_fb);} // TYPE_FLOAT +void hw_print_fb(nvObj_t *nv) { text_print(nv, fmt_fb);} // TYPE_FLOAT void hw_print_fbs(nvObj_t *nv) { text_print(nv, fmt_fbs);} // TYPE_STRING -void hw_print_fv(nvObj_t *nv) { text_print(nv, fmt_fv);} // TYPE_FLOAT -void hw_print_cv(nvObj_t *nv) { text_print(nv, fmt_cv);} // TYPE_FLOAT -void hw_print_hp(nvObj_t *nv) { text_print(nv, fmt_hp);} // TYPE_FLOAT -void hw_print_hv(nvObj_t *nv) { text_print(nv, fmt_hv);} // TYPE_FLOAT -void hw_print_id(nvObj_t *nv) { text_print(nv, fmt_id);} // TYPE_STRING +void hw_print_fbc(nvObj_t *nv) { text_print(nv, fmt_fbc);} // TYPE_STRING +void hw_print_fv(nvObj_t *nv) { text_print(nv, fmt_fv);} // TYPE_FLOAT +void hw_print_cv(nvObj_t *nv) { text_print(nv, fmt_cv);} // TYPE_FLOAT +void hw_print_hp(nvObj_t *nv) { text_print(nv, fmt_hp);} // TYPE_FLOAT +void hw_print_hv(nvObj_t *nv) { text_print(nv, fmt_hv);} // TYPE_FLOAT +void hw_print_id(nvObj_t *nv) { text_print(nv, fmt_id);} // TYPE_STRING #endif //__TEXT_MODE diff --git a/g2core/board/ArduinoDue/board_xio.cpp b/g2core/board/ArduinoDue/board_xio.cpp index 8df11bc4..04d9a326 100755 --- a/g2core/board/ArduinoDue/board_xio.cpp +++ b/g2core/board/ArduinoDue/board_xio.cpp @@ -47,7 +47,7 @@ decltype(usb.mixin<0>::Serial)& SerialUSB = usb.mixin<0>::Serial; decltype(usb.mixin<1>::Serial)& SerialUSB1 = usb.mixin<1>::Serial; // 115200 is the default, as well. -// UART Serial {115200, UARTMode::RTSCTSFlowControl}; +// UART Serial {115200, UARTMode::RTSCTSFlowControl}; MOTATE_SET_USB_VENDOR_STRING({'S', 'y', 'n', 't', 'h', 'e', 't', 'o', 's'}) @@ -64,7 +64,7 @@ Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART -Motate::UART Serial{ +Motate::UART Serial{ 115200, Motate::UARTMode::RTSCTSFlowControl}; #endif diff --git a/g2core/board/ArduinoDue/board_xio.h b/g2core/board/ArduinoDue/board_xio.h index 207a564c..a7bf7959 100755 --- a/g2core/board/ArduinoDue/board_xio.h +++ b/g2core/board/ArduinoDue/board_xio.h @@ -49,7 +49,7 @@ extern Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART #include "MotateUART.h" -extern Motate::UART Serial; +extern Motate::UART Serial; #endif diff --git a/g2core/board/ArduinoDue/gShield-pinout.h b/g2core/board/ArduinoDue/gShield-pinout.h index 94f258da..314ef41e 100755 --- a/g2core/board/ArduinoDue/gShield-pinout.h +++ b/g2core/board/ArduinoDue/gShield-pinout.h @@ -89,10 +89,10 @@ namespace Motate { // NOT ALL OF THESE PINS ARE ON ALL PLATFORMS // Undefined pins will be equivalent to Motate::NullPin, and return 1 for Pin<>::isNull(); -pin_number kSerial_RX = 0; -pin_number kSerial_TX = 1; -// pin_number kSerial_RTS = 8; // added later -// pin_number kSerial_CTS = 9; // added later +pin_number kSerial_RXPinNumber = 0; +pin_number kSerial_TXPinNumber = 1; +// pin_number kSerial_RTSPinNumber = 8; // added later +// pin_number kSerial_CTSPinNumber = 9; // added later pin_number kSerial0_RX = 0; pin_number kSerial0_TX = 1; diff --git a/g2core/board/ArduinoDue/shopbotShield-pinout.h b/g2core/board/ArduinoDue/shopbotShield-pinout.h index fadf485d..b9ba361e 100755 --- a/g2core/board/ArduinoDue/shopbotShield-pinout.h +++ b/g2core/board/ArduinoDue/shopbotShield-pinout.h @@ -82,8 +82,8 @@ namespace Motate { // NOT ALL OF THESE PINS ARE ON ALL PLATFORMS // Undefined pins will be equivalent to Motate::NullPin, and return 1 for Pin<>::isNull(); -pin_number kSerial_RX = 0; -pin_number kSerial_TX = 1; +pin_number kSerial_RXPinNumber = 0; +pin_number kSerial_TXPinNumber = 1; pin_number kSerial0_RX = 0; pin_number kSerial0_TX = 1; diff --git a/g2core/board/G2v9/board_xio.cpp b/g2core/board/G2v9/board_xio.cpp index 8df11bc4..04d9a326 100755 --- a/g2core/board/G2v9/board_xio.cpp +++ b/g2core/board/G2v9/board_xio.cpp @@ -47,7 +47,7 @@ decltype(usb.mixin<0>::Serial)& SerialUSB = usb.mixin<0>::Serial; decltype(usb.mixin<1>::Serial)& SerialUSB1 = usb.mixin<1>::Serial; // 115200 is the default, as well. -// UART Serial {115200, UARTMode::RTSCTSFlowControl}; +// UART Serial {115200, UARTMode::RTSCTSFlowControl}; MOTATE_SET_USB_VENDOR_STRING({'S', 'y', 'n', 't', 'h', 'e', 't', 'o', 's'}) @@ -64,7 +64,7 @@ Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART -Motate::UART Serial{ +Motate::UART Serial{ 115200, Motate::UARTMode::RTSCTSFlowControl}; #endif diff --git a/g2core/board/G2v9/board_xio.h b/g2core/board/G2v9/board_xio.h index 207a564c..a7bf7959 100755 --- a/g2core/board/G2v9/board_xio.h +++ b/g2core/board/G2v9/board_xio.h @@ -49,7 +49,7 @@ extern Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART #include "MotateUART.h" -extern Motate::UART Serial; +extern Motate::UART Serial; #endif diff --git a/g2core/board/G2v9/motate_pin_assignments.h b/g2core/board/G2v9/motate_pin_assignments.h index c1f50dfa..4239e8e0 100755 --- a/g2core/board/G2v9/motate_pin_assignments.h +++ b/g2core/board/G2v9/motate_pin_assignments.h @@ -39,10 +39,10 @@ namespace Motate { // NOT ALL OF THESE PINS ARE ON ALL PLATFORMS // Undefined pins will be equivalent to Motate::NullPin, and return 1 for Pin<>::isNull(); -pin_number kSerial_RX = 0; -pin_number kSerial_TX = 1; -pin_number kSerial_RTS = 8; // added later -pin_number kSerial_CTS = 9; // added later +pin_number kSerial_RXPinNumber = 0; +pin_number kSerial_TXPinNumber = 1; +pin_number kSerial_RTSPinNumber = 8; // added later +pin_number kSerial_CTSPinNumber = 9; // added later pin_number kSerial0_RX = 0; pin_number kSerial0_TX = 1; diff --git a/g2core/board/gquadratic/board_xio.cpp b/g2core/board/gquadratic/board_xio.cpp index 028c60a5..ff0846e1 100755 --- a/g2core/board/gquadratic/board_xio.cpp +++ b/g2core/board/gquadratic/board_xio.cpp @@ -49,7 +49,7 @@ decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial; decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial; // 115200 is the default, as well. -//UART Serial {115200, UARTMode::RTSCTSFlowControl}; +//UART Serial {115200, UARTMode::RTSCTSFlowControl}; MOTATE_SET_USB_VENDOR_STRING( u"Synthetos (http://synthetos.com)" ) MOTATE_SET_USB_PRODUCT_STRING( u"g2core gQuadratic" ) @@ -64,7 +64,7 @@ Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART -Motate::UART Serial {115200, Motate::UARTMode::RTSCTSFlowControl}; +Motate::UART Serial {115200, Motate::UARTMode::RTSCTSFlowControl}; #endif void board_hardware_init(void) // called 1st diff --git a/g2core/board/gquadratic/board_xio.h b/g2core/board/gquadratic/board_xio.h index dc57cd3c..102698d3 100755 --- a/g2core/board/gquadratic/board_xio.h +++ b/g2core/board/gquadratic/board_xio.h @@ -50,7 +50,7 @@ extern Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART #include "MotateUART.h" -extern Motate::UART Serial; +extern Motate::UART Serial; #endif //******* Generic Functions ******* diff --git a/g2core/board/gquadratic/gquadratic-b-pinout.h b/g2core/board/gquadratic/gquadratic-b-pinout.h index 220c7ffd..0eaa3c5d 100755 --- a/g2core/board/gquadratic/gquadratic-b-pinout.h +++ b/g2core/board/gquadratic/gquadratic-b-pinout.h @@ -126,8 +126,8 @@ _MAKE_MOTATE_PIN(kUnassigned1, 'A', 5); // _MAKE_MOTATE_PIN(kUnassigned2, 'A', 6); // Missing in 100-pin package _MAKE_MOTATE_PIN(kUnassigned3, 'A', 7); // _MAKE_MOTATE_PIN(kUnassigned4, 'A', 8); // -_MAKE_MOTATE_PIN(kSerial_RX, 'A', 9); // -_MAKE_MOTATE_PIN(kSerial_TX, 'A', 10); // +_MAKE_MOTATE_PIN(kSerial_RXPinNumber, 'A', 9); // +_MAKE_MOTATE_PIN(kSerial_TXPinNumber, 'A', 10); // _MAKE_MOTATE_PIN(kSocket1_Microstep_1PinNumber, 'A', 11); // _MAKE_MOTATE_PIN(kSocket1_EnablePinNumber, 'A', 12); // _MAKE_MOTATE_PIN(kUnassigned5, 'A', 13); // @@ -145,7 +145,7 @@ _MAKE_MOTATE_PIN(kUnassigned16, 'A', 24); // _MAKE_MOTATE_PIN(kUnassigned17, 'A', 25); // _MAKE_MOTATE_PIN(kUnassigned18, 'A', 26); // _MAKE_MOTATE_PIN(kSocket1_VrefPinNumber, 'A', 27); // TC2.1 -_MAKE_MOTATE_PIN(kSerial_CTS, 'A', 28); // +_MAKE_MOTATE_PIN(kSerial_CTSPinNumber, 'A', 28); // _MAKE_MOTATE_PIN(kUnassigned19, 'A', 29); // Missing in 100-pin package _MAKE_MOTATE_PIN(kServo1_PinNumber, 'A', 30); // PWM2 _MAKE_MOTATE_PIN(kInput4_PinNumber, 'A', 31); // @@ -172,7 +172,7 @@ _MAKE_MOTATE_PIN(kUnassigned25, 'D', 3); // _MAKE_MOTATE_PIN(kUnassigned26, 'D', 4); // _MAKE_MOTATE_PIN(kUnassigned27, 'D', 5); // _MAKE_MOTATE_PIN(kInput3_PinNumber, 'D', 6); // -_MAKE_MOTATE_PIN(kSerial_RTS, 'D', 7); // +_MAKE_MOTATE_PIN(kSerial_RTSPinNumber, 'D', 7); // _MAKE_MOTATE_PIN(kUnassigned28, 'D', 8); // INTERRUPT_OUT _MAKE_MOTATE_PIN(kUnassigned29, 'D', 9); // _MAKE_MOTATE_PIN(kUnassigned30, 'D', 10); // diff --git a/g2core/board/gquadratic/motate_pin_assignments.h b/g2core/board/gquadratic/motate_pin_assignments.h index c715b3bf..9cc268e7 100755 --- a/g2core/board/gquadratic/motate_pin_assignments.h +++ b/g2core/board/gquadratic/motate_pin_assignments.h @@ -30,8 +30,6 @@ #ifndef motate_pin_assignments_h #define motate_pin_assignments_h -#include - // Board pinout is pulled in after naming, so we can use the naming there. namespace Motate { @@ -40,15 +38,15 @@ namespace Motate { // Undefined pins will be equivalent to Motate::NullPin, and return 1 for Pin<>::isNull(); -pin_number kSerial_RX = 0; -pin_number kSerial_TX = 1; -pin_number kSerial_RTS = 2; // added later -pin_number kSerial_CTS = 3; // added later +pin_number kSerial_RXPinNumber = 0; +pin_number kSerial_TXPinNumber = 1; +pin_number kSerial_RTSPinNumber = 2; // added later +pin_number kSerial_CTSPinNumber = 3; // added later -pin_number kSerial0_RX = 0; -pin_number kSerial0_TX = 1; -pin_number kSerial0_RTS = 2; // added later -pin_number kSerial0_CTS = 3; // added later +pin_number kSerial0_RXPinNumber = 0; +pin_number kSerial0_TXPinNumber = 1; +pin_number kSerial0_RTSPinNumber = 2; // added later +pin_number kSerial0_CTSPinNumber = 3; // added later pin_number kI2C_SDAPinNumber = 5; pin_number kI2C_SCLPinNumber = 6; diff --git a/g2core/board/gquintic/board_xio.cpp b/g2core/board/gquintic/board_xio.cpp index 16e90f54..5f280380 100755 --- a/g2core/board/gquintic/board_xio.cpp +++ b/g2core/board/gquintic/board_xio.cpp @@ -49,7 +49,7 @@ decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial; decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial; // 115200 is the default, as well. -//UART Serial {115200, UARTMode::RTSCTSFlowControl}; +//UART Serial {115200, UARTMode::RTSCTSFlowControl}; MOTATE_SET_USB_VENDOR_STRING( {'S' ,'y', 'n', 't', 'h', 'e', 't', 'o', 's'} ) MOTATE_SET_USB_PRODUCT_STRING( {'T', 'i', 'n', 'y', 'G', ' ', 'v', '2'} ) @@ -64,7 +64,7 @@ Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART -Motate::UART Serial {115200, Motate::UARTMode::RTSCTSFlowControl}; +Motate::UART Serial {115200, Motate::UARTMode::RTSCTSFlowControl}; #endif void board_hardware_init(void) // called 1st diff --git a/g2core/board/gquintic/board_xio.h b/g2core/board/gquintic/board_xio.h index dc57cd3c..102698d3 100755 --- a/g2core/board/gquintic/board_xio.h +++ b/g2core/board/gquintic/board_xio.h @@ -50,7 +50,7 @@ extern Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART #include "MotateUART.h" -extern Motate::UART Serial; +extern Motate::UART Serial; #endif //******* Generic Functions ******* diff --git a/g2core/board/gquintic/gquintic-b-pinout.h b/g2core/board/gquintic/gquintic-b-pinout.h index 4134a229..75d7c52e 100755 --- a/g2core/board/gquintic/gquintic-b-pinout.h +++ b/g2core/board/gquintic/gquintic-b-pinout.h @@ -131,9 +131,9 @@ _MAKE_MOTATE_PIN(kI2C1_SCLPinNumber, 'A', 4); // _MAKE_MOTATE_PIN(kOutput11_PinNumber, 'A', 5); // _MAKE_MOTATE_PIN(kExternalClock1_PinNumber, 'A', 6); // CPU_CLK _MAKE_MOTATE_PIN(kOutput7_PinNumber, 'A', 7); // -_MAKE_MOTATE_PIN(kSerial_RTS, 'A', 8); // -_MAKE_MOTATE_PIN(kSerial_RX, 'A', 9); // -_MAKE_MOTATE_PIN(kSerial_TX, 'A', 10); // +_MAKE_MOTATE_PIN(kSerial_RTSPinNumber, 'A', 8); // +_MAKE_MOTATE_PIN(kSerial_RXPinNumber, 'A', 9); // +_MAKE_MOTATE_PIN(kSerial_TXPinNumber, 'A', 10); // _MAKE_MOTATE_PIN(kSocket2_EnablePinNumber, 'A', 11); // _MAKE_MOTATE_PIN(kOutput6_PinNumber, 'A', 12); // _MAKE_MOTATE_PIN(kOutput8_PinNumber, 'A', 13); // @@ -144,7 +144,7 @@ _MAKE_MOTATE_PIN(kADC3_PinNumber, 'A', 17); // _MAKE_MOTATE_PIN(kADC2_PinNumber, 'A', 18); // _MAKE_MOTATE_PIN(kADC1_PinNumber, 'A', 19); // _MAKE_MOTATE_PIN(kADC0_PinNumber, 'A', 20); // -_MAKE_MOTATE_PIN(kSerial_CTS, 'A', 21); // +_MAKE_MOTATE_PIN(kSerial_CTSPinNumber, 'A', 21); // _MAKE_MOTATE_PIN(kSocket1_EnablePinNumber, 'A', 22); // _MAKE_MOTATE_PIN(kOutput10_PinNumber, 'A', 23); // _MAKE_MOTATE_PIN(kSocket3_EnablePinNumber, 'A', 24); // diff --git a/g2core/board/gquintic/motate_pin_assignments.h b/g2core/board/gquintic/motate_pin_assignments.h index 57cf4ddc..713163e1 100755 --- a/g2core/board/gquintic/motate_pin_assignments.h +++ b/g2core/board/gquintic/motate_pin_assignments.h @@ -40,15 +40,15 @@ namespace Motate { // Undefined pins will be equivalent to Motate::NullPin, and return 1 for Pin<>::isNull(); -pin_number kSerial_RX = 0; -pin_number kSerial_TX = 1; -pin_number kSerial_RTS = 2; // added later -pin_number kSerial_CTS = 3; // added later +pin_number kSerial_RXPinNumber = 0; +pin_number kSerial_TXPinNumber = 1; +pin_number kSerial_RTSPinNumber = 2; // added later +pin_number kSerial_CTSPinNumber = 3; // added later -pin_number kSerial0_RX = 0; -pin_number kSerial0_TX = 1; -pin_number kSerial0_RTS = 2; // added later -pin_number kSerial0_CTS = 3; // added later +pin_number kSerial0_RXPinNumber = 0; +pin_number kSerial0_TXPinNumber = 1; +pin_number kSerial0_RTSPinNumber = 2; // added later +pin_number kSerial0_CTSPinNumber = 3; // added later pin_number kI2C_SDAPinNumber = 5; pin_number kI2C_SCLPinNumber = 6; diff --git a/g2core/board/printrboardg2/board_xio.cpp b/g2core/board/printrboardg2/board_xio.cpp index f46df5e9..2c217205 100755 --- a/g2core/board/printrboardg2/board_xio.cpp +++ b/g2core/board/printrboardg2/board_xio.cpp @@ -48,7 +48,7 @@ decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial; decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial; // 115200 is the default, as well. -//UART Serial {115200, UARTMode::RTSCTSFlowControl}; +//UART Serial {115200, UARTMode::RTSCTSFlowControl}; MOTATE_SET_USB_VENDOR_STRING( u"Synthetos" ) MOTATE_SET_USB_PRODUCT_STRING( u"TinyG v2" ) @@ -63,7 +63,7 @@ Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART -Motate::UART Serial {115200, Motate::UARTMode::RTSCTSFlowControl}; +Motate::UART Serial {115200, Motate::UARTMode::RTSCTSFlowControl}; #endif void board_hardware_init(void) // called 1st diff --git a/g2core/board/printrboardg2/board_xio.h b/g2core/board/printrboardg2/board_xio.h index fc241226..8164ad3c 100755 --- a/g2core/board/printrboardg2/board_xio.h +++ b/g2core/board/printrboardg2/board_xio.h @@ -48,7 +48,7 @@ extern Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART #include "MotateUART.h" -extern Motate::UART Serial; +extern Motate::UART Serial; #endif //******* Generic Functions ******* diff --git a/g2core/board/printrboardg2/motate_pin_assignments.h b/g2core/board/printrboardg2/motate_pin_assignments.h index f3d1e433..d82bcb26 100755 --- a/g2core/board/printrboardg2/motate_pin_assignments.h +++ b/g2core/board/printrboardg2/motate_pin_assignments.h @@ -40,10 +40,10 @@ namespace Motate { // Undefined pins will be equivalent to Motate::NullPin, and return 1 for Pin<>::isNull(); -pin_number kSerial_RX = 0; -pin_number kSerial_TX = 1; -pin_number kSerial_RTS = 2; // added later -pin_number kSerial_CTS = 3; // added later +pin_number kSerial_RXPinNumber = 0; +pin_number kSerial_TXPinNumber = 1; +pin_number kSerial_RTSPinNumber = 2; // added later +pin_number kSerial_CTSPinNumber = 3; // added later pin_number kSerial0_RX = 0; pin_number kSerial0_TX = 1; diff --git a/g2core/board/printrboardg2/printrboardG2v3-pinout.h b/g2core/board/printrboardg2/printrboardG2v3-pinout.h index d2183fdc..85df15db 100755 --- a/g2core/board/printrboardg2/printrboardG2v3-pinout.h +++ b/g2core/board/printrboardg2/printrboardG2v3-pinout.h @@ -130,14 +130,14 @@ _MAKE_MOTATE_PIN(kADC0_PinNumber, 'A', 4); // BED_ADC _MAKE_MOTATE_PIN(kOutput1_PinNumber, 'A', 5); // DO_1 (Extruder1_PWM) _MAKE_MOTATE_PIN(kOutput3_PinNumber, 'A', 6); // DO_3 (Fan1B_PWM) _MAKE_MOTATE_PIN(kOutputSAFE_PinNumber, 'A', 7); // DO_9 (SAFE_PULSES - output from MCU) -_MAKE_MOTATE_PIN(kSerial_RX, 'A', 8); // UART_RX -_MAKE_MOTATE_PIN(kSerial_TX, 'A', 9); // UART_TX +_MAKE_MOTATE_PIN(kSerial_RXPinNumber, 'A', 8); // UART_RX +_MAKE_MOTATE_PIN(kSerial_TXPinNumber, 'A', 9); // UART_TX _MAKE_MOTATE_PIN(kInput5_PinNumber, 'A', 10); // DI_5 (ZMin) _MAKE_MOTATE_PIN(kInput4_PinNumber, 'A', 11); // DI_4 (YMax) _MAKE_MOTATE_PIN(kUnassigned4, 'A', 12); // USART_RX (not used) _MAKE_MOTATE_PIN(kUnassigned5, 'A', 13); // USART_TX (not used) -_MAKE_MOTATE_PIN(kSerial_RTS, 'A', 14); // UART_RTS -_MAKE_MOTATE_PIN(kSerial_CTS, 'A', 15); // UART_CTS +_MAKE_MOTATE_PIN(kSerial_RTSPinNumber, 'A', 14); // UART_RTS +_MAKE_MOTATE_PIN(kSerial_CTSPinNumber, 'A', 15); // UART_CTS _MAKE_MOTATE_PIN(kSocket1_DirPinNumber, 'A', 16); // M1_DIR _MAKE_MOTATE_PIN(kUnassigned6, 'A', 17); // nc _MAKE_MOTATE_PIN(kSocket1_InterruptPinNumber, 'A', 18); // INTERRUPT_OUT diff --git a/g2core/board/sbv300/board_xio.cpp b/g2core/board/sbv300/board_xio.cpp index f586f285..712a89e9 100755 --- a/g2core/board/sbv300/board_xio.cpp +++ b/g2core/board/sbv300/board_xio.cpp @@ -48,7 +48,7 @@ decltype(usb.mixin<0>::Serial) &SerialUSB = usb.mixin<0>::Serial; decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial; // 115200 is the default, as well. -//UART Serial {115200, UARTMode::RTSCTSFlowControl}; +//UART Serial {115200, UARTMode::RTSCTSFlowControl}; MOTATE_SET_USB_VENDOR_STRING( {'S' ,'y', 'n', 't', 'h', 'e', 't', 'o', 's'} ) @@ -65,7 +65,7 @@ Motate::SPI spi; //******** UART ******** #if XIO_HAS_UART -Motate::UART Serial{ +Motate::UART Serial{ 115200, Motate::UARTMode::RTSCTSFlowControl}; #endif diff --git a/g2core/board/sbv300/board_xio.h b/g2core/board/sbv300/board_xio.h index 01919f1c..40b42a09 100755 --- a/g2core/board/sbv300/board_xio.h +++ b/g2core/board/sbv300/board_xio.h @@ -48,7 +48,7 @@ extern decltype(usb.mixin<1>::Serial)& SerialUSB1; //******** UART ******** //#include "MotateUART.h" -// extern Motate::UART Serial; +// extern Motate::UART Serial; diff --git a/g2core/board/sbv300/motate_pin_assignments.h b/g2core/board/sbv300/motate_pin_assignments.h index 9268f79b..de1a5dc7 100755 --- a/g2core/board/sbv300/motate_pin_assignments.h +++ b/g2core/board/sbv300/motate_pin_assignments.h @@ -39,10 +39,10 @@ namespace Motate { // NOT ALL OF THESE PINS ARE ON ALL PLATFORMS // Undefined pins will be equivalent to Motate::NullPin, and return 1 for Pin<>::isNull(); -pin_number kSerial_RX = -1; -pin_number kSerial_TX = -1; -pin_number kSerial_RTS = -1; // added later -pin_number kSerial_CTS = -1; // added later +pin_number kSerial_RXPinNumber = -1; +pin_number kSerial_TXPinNumber = -1; +pin_number kSerial_RTSPinNumber = -1; // added later +pin_number kSerial_CTSPinNumber = -1; // added later pin_number kSerial0_RX = -1; pin_number kSerial0_TX = -1;