Browse Source

Always disable probe at the end of G29

Scott Lahteine 8 years ago
parent
commit
2530371516
1 changed files with 4 additions and 5 deletions
  1. 4
    5
      Marlin/Marlin_main.cpp

+ 4
- 5
Marlin/Marlin_main.cpp View File

3814
 
3814
 
3815
     #if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(MECHANICAL_PROBE)
3815
     #if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(MECHANICAL_PROBE)
3816
       stow_z_probe();
3816
       stow_z_probe();
3817
+    #else
3818
+      endstops.enable_z_probe(false);
3817
     #endif
3819
     #endif
3818
 
3820
 
3819
     #ifdef Z_PROBE_END_SCRIPT
3821
     #ifdef Z_PROBE_END_SCRIPT
3824
         }
3826
         }
3825
       #endif
3827
       #endif
3826
       enqueue_and_echo_commands_P(PSTR(Z_PROBE_END_SCRIPT));
3828
       enqueue_and_echo_commands_P(PSTR(Z_PROBE_END_SCRIPT));
3827
-      #if HAS_BED_PROBE
3828
-        endstops.enable_z_probe(false);
3829
-      #endif
3830
       stepper.synchronize();
3829
       stepper.synchronize();
3831
     #endif
3830
     #endif
3832
 
3831
 
3857
     deploy_z_probe();
3856
     deploy_z_probe();
3858
 
3857
 
3859
     stepper.synchronize();
3858
     stepper.synchronize();
3860
-    // TODO: clear the leveling matrix or the planner will be set incorrectly
3861
 
3859
 
3862
-    run_z_probe();
3860
+    // TODO: clear the leveling matrix or the planner will be set incorrectly
3861
+    run_z_probe(); // clears the ABL non-delta matrix only
3863
 
3862
 
3864
     SERIAL_PROTOCOLPGM("Bed X: ");
3863
     SERIAL_PROTOCOLPGM("Bed X: ");
3865
     SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001);
3864
     SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001);

Loading…
Cancel
Save