Scott Lahteine
bd491818d6
Reduce storage requirements for strings, make some PGM
2016-06-27 20:36:18 -07:00
AnHardt
e480ee0054
Further cleanup of G28 for probes
2016-06-27 20:19:51 -07:00
AnHardt
39883d03fc
universalize axis_unhomed_error()
2016-06-27 20:19:51 -07:00
AnHardt
e616093d4c
Simplify dock_sled()
...
`dock_sled()` is never called with offset parameter - remove it.
We move x only - so only that needs to be homed. Consequence is - we can home to z-min now with a sled probe!
Feedrates are set and restored in `do_blocking_move()`.
We already checked if the probe is deployed/stowed in deploy/stow_probe.
```
if (z_loc < _Z_RAISE_PROBE_DEPLOY_STOW + 5) z_loc = _Z_RAISE_PROBE_DEPLOY_STOW;
```
makes no sense - remove.
Now the raise is the same for deploy/stow -> move before the if.
Replace the if with a ternary.
Instead writing LOW/HIGH use the boolean `stow` we already have.
There is no reason for not using the sled probe in G29/M48 with 'E'.
It takes a while but works. (tested!)
2016-06-27 20:19:51 -07:00
Scott Lahteine
829c92f1ba
Use Z_RAISE_BETWEEN_PROBINGS with MBL
2016-06-26 15:39:11 -07:00
Scott Lahteine
eb1755208f
Merge pull request #4153 from thinkyhead/rc_probe_raise_options
...
Combine Z raise before/after options
2016-06-26 15:30:08 -07:00
Scott Lahteine
10da7ac86c
Combine Z raise before/after options
2016-06-26 13:56:30 -07:00
Scott Lahteine
3fa631130f
Ensure a minimum height before XY move in probe_pt
2016-06-25 19:19:31 -07:00
Scott Lahteine
ca184d3d72
Merge pull request #4147 from thinkyhead/rc_fix_M48_raise
...
Fix debug output in probe_pt
2016-06-25 18:15:33 -07:00
Scott Lahteine
b4161cbd98
Fix debug output in probe_pt
2016-06-25 17:59:03 -07:00
Edward Patel
da88b00585
MBL: Add support for max z endstop
...
See https://github.com/MarlinFirmware/Marlin/issues/4088
2016-06-25 21:58:02 +02:00
Scott Lahteine
7de7552069
Merge pull request #4133 from MagoKimbra/Single_home_axis_delta
...
Single home Axis Delta need simple sync_plan_position
2016-06-23 21:14:22 -07:00
Scott Lahteine
15a6b49f37
Simplified probe_pt (in G30)
2016-06-23 20:25:46 -07:00
Scott Lahteine
6a7045b9bf
Remove clean_up_after_endstop_move
2016-06-23 20:23:19 -07:00
Scott Lahteine
2a4f866561
Simplified probe_pt (in G29)
2016-06-23 20:22:28 -07:00
Scott Lahteine
89a2aa026b
Simplified probe_pt (in M48)
2016-06-23 19:22:45 -07:00
Scott Lahteine
f8530c5d1f
Simplified probe_pt function (G28 grid)
2016-06-23 19:09:32 -07:00
Scott Lahteine
c376c08042
Simplified probe_pt function (part 1)
2016-06-23 19:00:29 -07:00
Scott Lahteine
9a71b7f8ad
Fix debug message for 3-point leveling
2016-06-23 18:17:31 -07:00
Scott Lahteine
550c03a5a9
Drop raise_z_after_probing function
2016-06-23 18:11:54 -07:00
Scott Lahteine
bb38c816af
Always raise in deploy_z_probe / stow_z_probe
2016-06-23 18:00:20 -07:00
Scott Lahteine
68f3350050
Cleanup M401 / M402
2016-06-23 17:04:41 -07:00
Scott Lahteine
3afda99adf
Regular handlers for G31 / G32
2016-06-23 17:04:13 -07:00
Scott Lahteine
6803c8e37e
Move Z up before, or down after XY, for "blocking move"
2016-06-23 15:50:13 -07:00
MagoKimbra
570f3bbc07
Single home Axis Delta need simple sync_plan_position
2016-06-23 23:09:47 +02:00
Scott Lahteine
7b2fadd598
Apply some fixes from Andreas
...
Derived from
https://github.com/AnHardt/Marlin/commit/6e8ede8c694fa4d9e3c769840b09d56
7f8d8e0dd
2016-06-22 17:35:59 -07:00
Scott Lahteine
bd01592816
Goodbye MECHANICAL_PROBE
2016-06-22 17:13:33 -07:00
Scott Lahteine
2640d13a9f
Simplify initial raise in M48
2016-06-22 16:53:04 -07:00
Scott Lahteine
3763d45656
Return Z position in run_z_probe
2016-06-22 16:52:32 -07:00
Scott Lahteine
1f48b5c30f
Pass a raise to probe_pt, not a Z position
2016-06-22 16:40:21 -07:00
Scott Lahteine
6fdd5ba246
Save and restore feedrate in more places
2016-06-22 16:40:20 -07:00
Scott Lahteine
fe173c2bc6
Generalized probe raise, use for after probing
2016-06-22 14:44:30 -07:00
Scott Lahteine
7da3080761
Simpler cleanup in G28 / G29
2016-06-22 14:44:30 -07:00
Scott Lahteine
15229d988b
Fix compile error for bed matrix in M48
2016-06-22 14:04:46 -07:00
Scott Lahteine
c01352cbd5
Add a dependency for z servo macros
2016-06-22 14:04:23 -07:00
Scott Lahteine
c3794bd695
Add HAS_PROBING_PROCEDURE conditional
2016-06-22 14:03:22 -07:00
Scott Lahteine
bb9c67b4b5
Tweak some feedrate vars
2016-06-22 03:27:31 -07:00
Scott Lahteine
5158bd6e93
Screen out G29 E
for sled and allen key, allow single probe
2016-06-22 03:20:33 -07:00
Scott Lahteine
ccae92588d
Cleanup debug in G28 and G29
2016-06-22 03:20:33 -07:00
Scott Lahteine
b4a9d2366c
Use a macro for kinematic sync_plan_position
2016-06-22 03:20:33 -07:00
Scott Lahteine
bfccf26294
Use sync_plan_position_delta where needed
2016-06-22 03:20:33 -07:00
Scott Lahteine
a6b8c67df4
Move probe deploy after setup call in G29
2016-06-22 03:20:33 -07:00
Scott Lahteine
e69916d1bd
Split up endstop_move functions
2016-06-22 03:20:33 -07:00
Scott Lahteine
0e18a4897b
Simpler handling of sled/allen-key in probe_pt
2016-06-22 03:20:33 -07:00
Scott Lahteine
1a92e2ef18
Comment on run_z_probe
2016-06-22 03:20:33 -07:00
Scott Lahteine
68e0e5855e
For all probes, at the end of G29 simply raise and stow
2016-06-22 03:20:33 -07:00
Scott Lahteine
c3023f8cc5
Make M401/M402 available with HAS_BED_PROBE
2016-06-22 03:20:33 -07:00
Scott Lahteine
9f0c255c69
Show uncorrected position in set_bed_level_equation_3pts
2016-06-22 03:20:33 -07:00
Scott Lahteine
07298ac992
Initialize current_position to home_offset on boot
2016-06-22 03:20:33 -07:00
Scott Lahteine
d50539583a
Make XY_PROBE_SPEED a general probe option
2016-06-22 03:04:47 -07:00