diff --git a/Motate b/Motate index 7d0dbb38..73dbb3ce 160000 --- a/Motate +++ b/Motate @@ -1 +1 @@ -Subproject commit 7d0dbb381fd3bc9685409f034f366bfda6879b53 +Subproject commit 73dbb3ce43f28cb3ac3c9175b3569dd3d6c93d5b diff --git a/g2core/Makefile b/g2core/Makefile index ccd21c76..fa453acb 100755 --- a/g2core/Makefile +++ b/g2core/Makefile @@ -56,7 +56,7 @@ ifeq ($(DEBUG),1) DEVICE_DEFINES += DEBUG=1 endif ifeq ($(DEBUG),2) - DEVICE_DEFINES += DEBUG=1 IN_DEBUGGER=2 + DEVICE_DEFINES += DEBUG=1 IN_DEBUGGER=1 endif # *** EOF *** diff --git a/g2core/board/gquadratic.gdb b/g2core/board/gquadratic.gdb index 864a9f89..bd2e8828 100644 --- a/g2core/board/gquadratic.gdb +++ b/g2core/board/gquadratic.gdb @@ -1,6 +1,8 @@ # Open and connect to openocd with the ATMEL-ICE target remote | /usr/local/bin/openocd -c "set CHIPNAME ${CHIP}" -f ${MOTATE_PATH}/openocd.cfg -f ${MOTATE_PATH}/platform/atmel_sam/atmel_sam.cfg -c "gdb_port pipe; log_output openocd.log" +monitor arm semihosting enable + source ./board/g2_default.gdb define boot_from_flash diff --git a/g2core/board/gquadratic/board_xio.cpp b/g2core/board/gquadratic/board_xio.cpp index 16e90f54..028c60a5 100755 --- a/g2core/board/gquadratic/board_xio.cpp +++ b/g2core/board/gquadratic/board_xio.cpp @@ -51,8 +51,8 @@ decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial; // 115200 is the default, as well. //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 diff --git a/g2core/board/gquadratic/gquadratic-a-pinout.h b/g2core/board/gquadratic/gquadratic-a-pinout.h index ae48b3b7..600accfe 100755 --- a/g2core/board/gquadratic/gquadratic-a-pinout.h +++ b/g2core/board/gquadratic/gquadratic-a-pinout.h @@ -89,7 +89,7 @@ #define ADC2_AVAILABLE 0 #define ADC3_AVAILABLE 0 -#define XIO_HAS_USB 0 +#define XIO_HAS_USB 1 #define XIO_HAS_UART 1 #define XIO_HAS_SPI 0 #define XIO_HAS_I2C 0 diff --git a/g2core/g2core.xcodeproj/project.pbxproj b/g2core/g2core.xcodeproj/project.pbxproj index 0c0a9351..d6ac4fe3 100644 --- a/g2core/g2core.xcodeproj/project.pbxproj +++ b/g2core/g2core.xcodeproj/project.pbxproj @@ -387,7 +387,7 @@ D45710B8170532AC00EA19A8 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = "Rob Giseburt"; }; buildConfigurationList = D45710BB170532AC00EA19A8 /* Build configuration list for PBXProject "g2core" */; @@ -509,7 +509,24 @@ D45710BD170532AC00EA19A8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; }; name = Debug; @@ -517,6 +534,23 @@ D45710BE170532AC00EA19A8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; }; name = Release; }; diff --git a/g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 G2V9k.xcscheme b/g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 G2V9k.xcscheme index e6e0fe3c..0f8f4cb3 100644 --- a/g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 G2V9k.xcscheme +++ b/g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 G2V9k.xcscheme @@ -1,6 +1,6 @@