Fix merge conflit

This commit is contained in:
pedro 2022-02-21 13:51:26 +00:00
commit 3256d6d5f8

View File

@ -39,7 +39,7 @@ M558 P9 C"^io7.in" H5 F300 T10000 A5 S0.05 R0.2 ; set Z probe type to bltouch
;; Pay special attention to the values bellow on G31, the Z value needs to be validated for your printer ;; Pay special attention to the values bellow on G31, the Z value needs to be validated for your printer
;; Start with something like 0.5 ;; Start with something like 0.5
;; Documentation available: https://duet3d.dozuki.com/Wiki/Test_and_calibrate_the_Z_probe ;; Documentation available: https://duet3d.dozuki.com/Wiki/Test_and_calibrate_the_Z_probe
G31 P500 X-35 Y-0.5 Z2.525 ; set Z probe trigger value, offset and trigger height G31 P500 X-35 Y-0.5 Z2.640 ; set Z probe trigger value, offset and trigger height
M671 X-6:250:503 Y0:511:0 S100 ; define positions of Z leadscrews or bed levelling screws M671 X-6:250:503 Y0:511:0 S100 ; define positions of Z leadscrews or bed levelling screws
M557 X5:465 Y5:465 P20 ; define 20x20 mesh grid M557 X5:465 Y5:465 P20 ; define 20x20 mesh grid