Merge pull request #754 from BrianGilbert/edge

Fix OS X build script to run without 'ambiguous redirect' errors for references …

diff --git a/FirmwareBin/firmware-disablemsd.bin b/FirmwareBin/firmware-disablemsd.bin
index e83aa98..d1602cc 100755 (executable)
Binary files a/FirmwareBin/firmware-disablemsd.bin and b/FirmwareBin/firmware-disablemsd.bin differ

diff --git a/FirmwareBin/firmware.bin b/FirmwareBin/firmware.bin
index 20ef02f..74bb67c 100755 (executable)
Binary files a/FirmwareBin/firmware.bin and b/FirmwareBin/firmware.bin differ

diff --git a/FirmwareBin/firmware.bin.md5sum b/FirmwareBin/firmware.bin.md5sum
index 15bae7a..2a357db 100644 (file)
--- a/FirmwareBin/firmware.bin.md5sum
+++ b/FirmwareBin/firmware.bin.md5sum
@@ -1 +1 @@
-1197697c2c8ef70479bea3c46b4f5d33  FirmwareBin/firmware.bin
+ede3117310b88a032d2276bbb3769b1b  FirmwareBin/firmware.bin

diff --git a/src/modules/tools/endstops/Endstops.cpp b/src/modules/tools/endstops/Endstops.cpp
index 7f7d3b1..babe738 100644 (file)
--- a/src/modules/tools/endstops/Endstops.cpp
+++ b/src/modules/tools/endstops/Endstops.cpp
@@ -699,11 +699,13 @@ void Endstops::on_gcode_received(void *argument)
 
             // on some systems where 0,0 is bed center it is noce to have home goto 0,0 after homing
             // default is off
-            if(this->move_to_origin_after_home)
-                move_to_origin(axes_to_move);
+            if(!is_delta && this->move_to_origin_after_home) move_to_origin(axes_to_move);
 
             // if limit switches are enabled we must back off endstop after setting home
             back_off_home(axes_to_move);
+
+            // deltas are not left at 0,0 becuase of the trim settings, so move to 0,0 if requested
+            if(is_delta && this->move_to_origin_after_home) move_to_origin(axes_to_move);
         }
 
     } else if (gcode->has_m) {