220 Commits (6c5a460e65ff406aca5b76a1a767f4e6d5c7c700)

Author SHA1 Message Date
Neil Darlow 6c5a460e65 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
galexander1 cb4a6dd2dc Merge pull request #1065 from oliasmage/Marlin_v1
10 years ago
Bracken Dawson 01e9b536cb Fix build for non-sled bed auto levelling
10 years ago
Charles Bell 3b8216bdd1 Corrected #endif and ifdef for Z_PROBE_SLED code.
10 years ago
Charles Bell 37799f70ba Corrected retract() call for use of auto probe without sled enabled.
10 years ago
Neil Darlow 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Erik van der Zalm 018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
10 years ago
Erik van der Zalm 9887555192 Merge pull request #998 from darconeous/pull-requests/fwretract
10 years ago
Erik van der Zalm 68dd5e635e Merge pull request #1024 from oliasmage/Marlin_v1
10 years ago
Erik van der Zalm 25069ed4e9 Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults
10 years ago
Florian Baumann 5908fd5cec Fix reseting CHDK pin to LOW
10 years ago
Roxy-3DPrintBoard 0091865583 Z_PROBE_REPEATABILITY test
10 years ago
Charles Bell d2fcb3ee56 CAB: Added code for Z-probe with Z endstop mounted on a sled.
10 years ago
Neil Darlow 3cd7dbcc45 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
daid c13a831ea1 Merge pull request #1017 from foosel/fix/checksum_truncation_bug
10 years ago
Gina Häußge 2d22902d08 Fix for a wrong checksum truncation for certain commands
10 years ago
cocktailyogi 2f4a20257c imported last Marlin changes
10 years ago
daid aacff0d361 Merge pull request #948 from Dim3nsioneer/Marlin_v1
10 years ago
Robert Quattlebaum 1fd9a7d476 Fix for FWRETRACT on DELTA printers.
10 years ago
Neil Darlow 3f2c771d90 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Pablo Clemente 2242a84218 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965
10 years ago
Neil Darlow 6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Pablo Clemente d86c3cf43c Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.
10 years ago
cocktailyogi f0cab611db optimised some math-code
11 years ago
cocktailyogi fae7d08698 fixed wrong compiler-option
11 years ago
cocktailyogi 512f2a3136 restore Branch from Backup
11 years ago
Pablo Clemente cd3220d055 Inverted state logic for forced_heating_stop variable
11 years ago
Pablo Clemente 86b4b805d2 Fixed stop print LCD function on M104
11 years ago
Dim3nsioneer 3c927901a4 Implementation of FW extruder change retract
11 years ago
neildarlow efb6d61413 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
nothinman 38192cb5f3 Add M112 description to Marlin_main
11 years ago
nothinman aed5ec008a Merge pull request #851 from DanNixon/estop
11 years ago
Erik van der Zalm cfb98ef682 More coverity fixes
11 years ago
Erik van der Zalm 9db9842aea Fixed error found by the free coverity tool (https://scan.coverity.com/)
11 years ago
Neil Darlow e541323741 Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
MyMakibox 21ec6b88c3 Update Marlin_main.cpp
11 years ago
Neil Darlow 6adbdf42e0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
whosawhatsis 27d544ac25 Speed up QUICK_HOME feedrate for diagonal move
11 years ago
neildarlow 95ad6ec9a1 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Gabe Rosenhouse 27a7cf9fcf use existing strings
11 years ago
Gabe Rosenhouse b0aeac117f Adjustable Z probe offset, via custom M-code
11 years ago
Neil Darlow 73b380d8d2 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
nothinman c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract
11 years ago
nothinman 9a5d23d96f Merge pull request #866 from sakunamary/Marlin_v1
11 years ago
nothinman 303ee67896 Merge pull request #864 from whosawhatsis/M200
11 years ago
Tim 8759508319 fix bug for dual extruders not working
11 years ago
whosawhatsis a65564eef6 fix bug in M200 with multiple extruders
11 years ago
whosawhatsis aeaf9b9312 fix bug in M200 with multiple extruders
11 years ago
Dan Nixon f643f4d674 Test and refactor
11 years ago
neildarlow bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago