Fix set origin from lcd

mandolincreek · Mar 25, 2018 · d1cb3c9 · d1cb3c9
1 parent 5e13879
commit d1cb3c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/ArduinoAVR/Repetier/ui.cpp b/src/ArduinoAVR/Repetier/ui.cpp
@@ -3300,7 +3300,7 @@ int UIDisplay::executeAction(unsigned int action, bool allowMoves) {
             break;
         case UI_ACTION_SET_ORIGIN:
             if(!allowMoves) return UI_ACTION_SET_ORIGIN;
-            Printer::setOrigin(0, 0, 0);
+            Printer::setOrigin(-Printer::currentPosition[X_AXIS], -Printer::currentPosition[Y_AXIS], -Printer::currentPosition[Z_AXIS]);
             break;
         case UI_ACTION_TOGGLE_JAMCONTROL:
             Printer::setJamcontrolDisabled(!Printer::isJamcontrolDisabled());

diff --git a/src/ArduinoDUE/Repetier/pins.h b/src/ArduinoDUE/Repetier/pins.h
@@ -616,8 +616,8 @@ STEPPER_CURRENT_CONTROL
 #define E0_PINS ORIG_E0_STEP_PIN,ORIG_E0_DIR_PIN,ORIG_E0_ENABLE_PIN,
 #define E1_PINS ORIG_E1_STEP_PIN,ORIG_E1_DIR_PIN,ORIG_E1_ENABLE_PIN,
 
-#define TWI_CLOCK_FREQ          100000
 #if MOTHERBOARD == 408
+#define TWI_CLOCK_FREQ          100000
 //	20 or 70
 #define SDA_PIN 			-1 
 // 21 or 71

diff --git a/src/ArduinoDUE/Repetier/ui.cpp b/src/ArduinoDUE/Repetier/ui.cpp
@@ -3300,7 +3300,7 @@ int UIDisplay::executeAction(unsigned int action, bool allowMoves) {
             break;
         case UI_ACTION_SET_ORIGIN:
             if(!allowMoves) return UI_ACTION_SET_ORIGIN;
-            Printer::setOrigin(0, 0, 0);
+            Printer::setOrigin(-Printer::currentPosition[X_AXIS], -Printer::currentPosition[Y_AXIS], -Printer::currentPosition[Z_AXIS]);
             break;
         case UI_ACTION_TOGGLE_JAMCONTROL:
             Printer::setJamcontrolDisabled(!Printer::isJamcontrolDisabled());