From c3f1869271082a9f013f1f2f23a214b83cc89358 Mon Sep 17 00:00:00 2001
From: Alden Hart <alden08@harts.org>
Date: Mon, 26 Mar 2018 09:21:03 -0400
Subject: [PATCH] Fixed typo in settings_default.h; fixed bug in B and C axes
 mapping in plan_line.cpp

---
 g2core/g2core.cppproj              | 4 ++--
 g2core/plan_line.cpp               | 2 +-
 g2core/settings/settings_default.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/g2core/g2core.cppproj b/g2core/g2core.cppproj
index 0b608521..876b4307 100644
--- a/g2core/g2core.cppproj
+++ b/g2core/g2core.cppproj
@@ -68,7 +68,7 @@
     <com_atmel_avrdbg_tool_atmelice>
       <ToolOptions>
         <InterfaceProperties>
-          <SwdClock>2000000</SwdClock>
+          <SwdClock>10000000</SwdClock>
         </InterfaceProperties>
         <InterfaceName>SWD</InterfaceName>
       </ToolOptions>
@@ -102,7 +102,7 @@
     <preserveEEPROM>true</preserveEEPROM>
     <avrtoolserialnumber>J41800019454</avrtoolserialnumber>
     <avrdeviceexpectedsignature>0x284E0A60</avrdeviceexpectedsignature>
-    <avrtoolinterfaceclock>2000000</avrtoolinterfaceclock>
+    <avrtoolinterfaceclock>10000000</avrtoolinterfaceclock>
     <custom>
       <ToolOptions xmlns="">
         <InterfaceProperties>
diff --git a/g2core/plan_line.cpp b/g2core/plan_line.cpp
index 1d23863e..4d147206 100644
--- a/g2core/plan_line.cpp
+++ b/g2core/plan_line.cpp
@@ -190,7 +190,7 @@ stat_t mp_aline(GCodeState_t* _gm)
     // copy rotation axes for ABC (no changes)
     target_rotated[AXIS_A] = _gm->target[AXIS_A];
     target_rotated[AXIS_B] = _gm->target[AXIS_B];
-    target_rotated[AXIS_B] = _gm->target[AXIS_C];
+    target_rotated[AXIS_C] = _gm->target[AXIS_C];
 
     for (uint8_t axis = 0; axis < AXES; axis++) {
         axis_length[axis] = target_rotated[axis] - mp->position[axis];
diff --git a/g2core/settings/settings_default.h b/g2core/settings/settings_default.h
index 00cd7777..c97979f8 100644
--- a/g2core/settings/settings_default.h
+++ b/g2core/settings/settings_default.h
@@ -582,7 +582,7 @@
 #define V_LATCH_BACKOFF             4.0
 #endif
 #ifndef V_ZERO_BACKOFF
-#define Y_ZERO_BACKOFF              2.0
+#define V_ZERO_BACKOFF              2.0
 #endif
 
 // W AXIS