From 30d7a73e33bbd8e3e86e8818915c0b451da2ab79 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Tue, 13 Sep 2016 13:15:22 -0500 Subject: [PATCH 1/6] Experimental adjustment to Y axis on Simple1608 --- g2core/settings/settings_Printrbot_Simple_1608.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g2core/settings/settings_Printrbot_Simple_1608.h b/g2core/settings/settings_Printrbot_Simple_1608.h index 1c7c2c48..320aa2d4 100755 --- a/g2core/settings/settings_Printrbot_Simple_1608.h +++ b/g2core/settings/settings_Printrbot_Simple_1608.h @@ -103,7 +103,7 @@ // 80 steps/mm at 1/16 microstepping = 40 mm/rev #define M3_MOTOR_MAP AXIS_Y #define M3_STEP_ANGLE 1.8 -#define M3_TRAVEL_PER_REV 40.132 +#define M3_TRAVEL_PER_REV 40.011604 #define M3_MICROSTEPS 32 #define M3_POLARITY 0 #define M3_POWER_MODE MOTOR_POWER_MODE From 7edd1ce674a6f09b7beeef08c04a8f9265c4643d Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Thu, 15 Sep 2016 08:27:12 -0500 Subject: [PATCH 2/6] Update motate reference (for Windows make .. clean not working) --- Motate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Motate b/Motate index 7d0dbb38..73dbb3ce 160000 --- a/Motate +++ b/Motate @@ -1 +1 @@ -Subproject commit 7d0dbb381fd3bc9685409f034f366bfda6879b53 +Subproject commit 73dbb3ce43f28cb3ac3c9175b3569dd3d6c93d5b From af481f8395d523fb672238b1612e70b81e4cdc86 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Mon, 26 Sep 2016 10:59:14 -0500 Subject: [PATCH 3/6] Update Printrbot Simple 1608 dimensions. --- g2core/settings/settings_Printrbot_Simple_1608.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/g2core/settings/settings_Printrbot_Simple_1608.h b/g2core/settings/settings_Printrbot_Simple_1608.h index 320aa2d4..7b24e154 100755 --- a/g2core/settings/settings_Printrbot_Simple_1608.h +++ b/g2core/settings/settings_Printrbot_Simple_1608.h @@ -142,7 +142,7 @@ #define X_VELOCITY_MAX 10000 // xvm G0 max velocity in mm/min #define X_FEEDRATE_MAX X_VELOCITY_MAX // xfr G1 max feed rate in mm/min #define X_TRAVEL_MIN 0 // xtn minimum travel - used by soft limits and homing -#define X_TRAVEL_MAX 200 // xtm travel between switches or crashes +#define X_TRAVEL_MAX 215 // xtm travel between switches or crashes #define X_JERK_MAX 3000 // xjm yes, that's "100 billion" mm/(min^3) #define X_JERK_HIGH_SPEED 3000 // xjh #define X_HOMING_INPUT 4 // xhi input used for homing or 0 to disable @@ -156,7 +156,7 @@ #define Y_VELOCITY_MAX 10000 #define Y_FEEDRATE_MAX Y_VELOCITY_MAX #define Y_TRAVEL_MIN 0 -#define Y_TRAVEL_MAX 150 +#define Y_TRAVEL_MAX 152.4 #define Y_JERK_MAX 3000 #define Y_JERK_HIGH_SPEED 3000 #define Y_HOMING_INPUT 1 @@ -170,7 +170,7 @@ #define Z_VELOCITY_MAX 2000 #define Z_FEEDRATE_MAX Z_VELOCITY_MAX #define Z_TRAVEL_MIN 0 -#define Z_TRAVEL_MAX 200 +#define Z_TRAVEL_MAX 215 #define Z_JERK_MAX 1500 #define Z_JERK_HIGH_SPEED 3000 #define Z_HOMING_INPUT 5 From f1448b1fc22a2e19ecb8362414317cdd16bff4e7 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Mon, 26 Sep 2016 10:59:58 -0500 Subject: [PATCH 4/6] Updated gQuadratic board settings --- g2core/board/gquadratic.gdb | 2 ++ g2core/board/gquadratic/board_xio.cpp | 4 ++-- g2core/board/gquadratic/gquadratic-a-pinout.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) 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 From 9bf418c6c3f8c63292db1219676383856e15c7a2 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Mon, 26 Sep 2016 11:00:37 -0500 Subject: [PATCH 5/6] Fix for DEBUG=2 setting IN_DEBUGGER=1 properly. --- g2core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 *** From 06cf5a73c1e7a87ccafbfd98bc208802b4066507 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Mon, 26 Sep 2016 11:01:39 -0500 Subject: [PATCH 6/6] Xcode project updates --- g2core/g2core.xcodeproj/project.pbxproj | 36 ++++++++++++++++++- .../xcshareddata/xcschemes/G2 G2V9k.xcscheme | 2 +- .../xcschemes/G2 V9 Shapeoko Dual-Y.xcscheme | 2 +- .../xcschemes/G2 gQuadratic Test.xcscheme | 2 +- .../G2 gQuintic PrintrbotPlus.xcscheme | 2 +- .../xcschemes/G2 gShield.xcscheme | 2 +- .../G2 printrboardG2v3 PrintrbotPlus.xcscheme | 2 +- .../xcshareddata/xcschemes/G2 sbv300.xcscheme | 2 +- .../xcshareddata/xcschemes/G2Core.xcscheme | 2 +- .../xcshareddata/xcschemes/index.xcscheme | 2 +- 10 files changed, 44 insertions(+), 10 deletions(-) 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 @@