Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-24 05:53:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/edge-100' into edge

Browse Source
This commit is contained in:
Rob Giseburt
2016-09-26 13:06:39 -05:00
parent edc56afb6d 06cf5a73c1
commit f1d54d1914
16 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Motate
+1 -1
Submodule Motate updated: 7d0dbb381f...73dbb3ce43
g2core/Makefile
+1 -1
View File
@@ -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 ***
g2core/board/gquadratic.gdb
+2
View File
@@ -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
g2core/board/gquadratic/board_xio.cpp
+2 -2
View File
@@ -51,8 +51,8 @@ decltype(usb.mixin<1>::Serial) &SerialUSB1 = usb.mixin<1>::Serial;
// 115200 is the default, as well.
//UART<kSerial_RX, kSerial_TX, kSerial_RTS, kSerial_CTS> 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
g2core/board/gquadratic/gquadratic-a-pinout.h
+1 -1
View File
@@ -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
g2core/g2core.xcodeproj/project.pbxproj
+35 -1
View File
@@ -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;
};
g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 G2V9k.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 V9 Shapeoko Dual-Y.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 gQuadratic Test.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 gQuintic PrintrbotPlus.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 gShield.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 printrboardG2v3 PrintrbotPlus.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2 sbv300.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/g2core.xcodeproj/xcshareddata/xcschemes/G2Core.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/g2core.xcodeproj/xcshareddata/xcschemes/index.xcscheme
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
g2core/settings/settings_Printrbot_Simple_1608.h
+4 -4
View File
@@ -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
@@ -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