f9e08b1fcd
Merge pull request #4254 from AnHardt/killscreen
...
Add a kill-screen
9 years ago
faac2bcfdb
Add a kill-screen
9 years ago
3b3e52616c
Merge pull request #4253 from thinkyhead/rc_clexpert_runout
...
Runout Sensor without SD Card, Print Timer support in M104
9 years ago
4cd045791c
Reduce code size by trusting the compiler
9 years ago
a8538bd7ce
General cleanup, code reduction in Marlin_main.cpp
9 years ago
1026e5b071
Replace PLA/ABS preheating with generic
9 years ago
315b4c2153
Runout sensor without SD Card
9 years ago
468f7f03a2
homeaxis() can leave early
...
when no known axis needs to be homed.
Most changes are only caused from altering the indentation.
```
if (axis == X_AXIS ? HOMEAXIS_DO(X) : axis == Y_AXIS ? HOMEAXIS_DO(Y) : axis == Z_AXIS ? HOMEAXIS_DO(Z) : 0) {
...
}
to
if (!(axis == X_AXIS ? HOMEAXIS_DO(X) : axis == Y_AXIS ? HOMEAXIS_DO(Y) : axis == Z_AXIS ? HOMEAXIS_DO(Z) : 0)) return;
...
```
9 years ago
eff7912243
Ensble/disable hardware endstops in G28 globally.
...
For moving away from the endstops we do not have to disable them.
They are not tested anyway.
9 years ago
f69434d81c
Eliminate `void setup_for_endstop_move()`
9 years ago
0ea6247fc2
Use logic in Z_SAFE_HOMING
...
Use logic in Z_SAFE_HOMING
From
```
if (home_all_axis || homeZ) {
if (home_all_axis) {
...
home z
}
else if (homeZ) { // Don't need to Home Z twice
home z
}
}
```
to
```
if (home_all_axis || homeZ) {
if (home_all_axis) {
...
}
home z
}
```
9 years ago
de3a169336
Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
...
Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
Always make a potential rise to `home_offset[Z_AXIS]` possible in G28.
Get rid of some very ugly constructs in MBL (ultralcd.cpp).
9 years ago
88ed232f53
Remove HAS_BED_PROBE case in first raise in G28
...
Differentiating made sense here when we could save a dozen lines of code,
but not for one line.
9 years ago
653eff3b31
Clean up `quick_home_xy()`
...
Since we do the actual homing now in the 'normal' routines `quick_home_xy()`
can be simplified to a relative simple diagonal move.
9 years ago
98d0167a57
Merge pull request #4226 from thinkyhead/rc_emergency_command_parser
...
MarlinSerial emergency-command parser (with M108)
9 years ago
2ee4e4f791
Make wait_for_heatup volatile
9 years ago
834ad14c8d
Add quickstop_stepper to update current position with stepper.quick_stop()
9 years ago
ecffe92e20
Group EMERGENCY_PARSER commands
9 years ago
a129078927
Add an emergency-command parser to MarlinSerial (supporting M108)
...
Add an emergency-command parser to MarlinSerial's RX interrupt.
The parser tries to find and execute M108,M112,M410 before the commands disappear in the RX-buffer.
To avoid false positives for M117, comments and commands followed by filenames (M23, M28, M30, M32, M33) are filtered.
This enables Marlin to receive and react on the Emergency command at all times - regardless of whether the buffers are full or not. It remains to convince hosts to send the commands. To inform the hosts about the new feature a new entry in the M115-report was made. "`EMERGENCY_CODES:M112,M108,M410;`".
The parser is fast. It only ever needs two switch decisions and one assignment of the new state for every character.
One problem remains. If the host has sent an incomplete line before sending an emergency command the emergency command could be omitted when the parser is in `state_IGNORE`.
In that case the host should send "\ncommand\n"
Also introduces M108 to break the waiting for the heaters in M109, M190 and M303.
Rename `cancel_heatup` to `wait_for_heatup` to better see the purpose.
9 years ago
9f42b1a075
Merge pull request #4235 from thinkyhead/rc_revert_quickhome_test
...
Fix quick homing, tweak MIN_Z_HEIGHT_FOR_HOMING
9 years ago
ad968f2325
Merge pull request #4234 from thinkyhead/rc_better_position_logging
...
Move XYZ in print_xyz and DEBUG_POS to the front
9 years ago
4036c73cdd
Don't raise Z if only homing Z
9 years ago
0b6f8f8244
Apply MIN_Z_HEIGHT_FOR_HOMING raise literally
9 years ago
177ec20bf0
Revert quick-home changes
9 years ago
9c5b462ef2
Move XYZ in print_xyz and DEBUG_POS to the front
9 years ago
4e84c803a3
Merge pull request #4232 from thinkyhead/rc_no_axis_codes_needed
...
Don't use axis_codes if a literal will do
9 years ago
e2f7cb0905
Don't use axis_codes if a literal will do
9 years ago
6559f7359f
Fix comment on Z raise for homing, save a few bytes
9 years ago
d0b29cabf3
Don't re-home X and Y if you quick homed
9 years ago
e0a6b978f5
Don't do_probe_raise with MIN_Z_HEIGHT_FOR_HOMING
9 years ago
7735ec5e7a
Merge pull request #4223 from thinkyhead/rc_rename_heatup
...
Change cancel_heatup to wait_for_heatup
9 years ago
160a2be117
Change cancel_heatup to wait_for_heatup
9 years ago
16c83d203b
Make use of the good features of a sled probe for all probes.
...
Move and extend axis_unhomed test to deploy/stow_z_probe().
Move and extend position store/restore to deploy/stow_z_probe().
Now all kinds of probes can use the 'E' parameter in G29/M48.
Allen key probes can be used now for grid and 3-point levelling.
Deploying the Allen Key probe uses big moves in z direction.
Too dangerous for an unhomed z-axis.
Throw a compile time error when we try to configure an
Allen Key probe homing to z-min and having no other z-min-endstop.
9 years ago
8555816a11
Generalize and simplify 'triggered when stowed test`
...
The `PROBE_IS_TRIGGERED_WHEN_STOWED_TEST` is able to detect if a probe is
successfully deployed/stowed.
It was part of the Allen Key probes code only.
Now the function is generally available.
Currently this test is compulsory for Allen Key probes to not alter the used behaviour
If you want to add the test for an other type of probe simply add
```
#define PROBE_IS_TRIGGERED_WHEN_STOWED_TEST
```
to your config.
9 years ago
5126cce7fd
Move Allen Key probe move scripts to their own functions
...
There was an hidden extra move after the scripts. This is configurable now.
Added the extra moves to the relevant configs.
9 years ago
7d063c111c
Add a optional feedrate parameter to `do_blocking_move()`
...
Add a optional feedrate parameter to `do_blocking_move()` and its companions.
9 years ago
b114b6a0b3
Save 152 bytes using uint8_t for command indices
9 years ago
0d4ff0c48b
Allow the queue to be cleared from within commands
9 years ago
c450851401
Merge pull request #4209 from AnHardt/too-high-G28
...
Make raise for probe deploy relative in homeaxis()
9 years ago
f799f18388
MBL typo
9 years ago
8b02e68cb6
Make raise for probe deploy relative in homeaxis()
...
Make raise for probe deploy relative in homeaxis()
by setting `current_position[axis]` to zero later.
9 years ago
e48502866b
Merge pull request #3611 from alephobjects/M108_cancel_heatup
...
Introduce M108 cancel wait for heatup/cooldown of the hotend and bed
9 years ago
d70197f514
Merge pull request #4204 from thinkyhead/rc_fix_gcode_t_position
...
Additional patches for gcode_T position change
9 years ago
869b517589
Merge pull request #4205 from thinkyhead/rc_fixup_unit_references
...
References to millimeters in code comments need an update
9 years ago
e104b91ea6
References to millimeters in code comments need an update
9 years ago
ff91d28a3a
Remove wants_to_cool warning
...
Remove wants_to_cool warning
9 years ago
c9e536cf87
Additional patches for gcode_T position change
9 years ago
f31af61ee2
Fix position adjustment with gcode_T and MBL
9 years ago
9b42c6b44b
apply correction when swtiching from MBL to physical in G28 X
9 years ago
43ff0ce35f
Rewritten FILAMENT_CHANGE_ENABLE feature
9 years ago
cb1b31f69b
Unconditional do_probe_raise() in probe_pt()
...
If Z_RAISE_BETWEEN_PROBINGS is null or undefined the probe is currently not raised by home_offset[Z_AXIS] and zprobe_zoffset.
But when different from 0 is.
If an undefined Z_RAISE_BETWEEN_PROBINGS expands to 0 (and it does) this is the solution.
A similar asymmetry exists with the newly introduced 'short-cut' in G28 - but its the rise before anything is probed - so should not make a difference.
9 years ago
7ef7843fd4
Merge pull request #4181 from thinkyhead/rc_rename_a_move_func
...
Do interpolated moves for Allen Key deploy/stow
9 years ago
da6b0dab5f
Use prepare_move_to_destination for Allen Key deploy/stow
9 years ago
c42f8fb8dd
Rename some movement sub-functions
9 years ago
5e14a528dd
Always wait for cooling in M109/M190, break at low temp or if cooling stalls
9 years ago
2e96276bf4
More debug message cleanup
9 years ago
dc2c0e5e24
Simpler debug output for deploy/stow
9 years ago
bd491818d6
Reduce storage requirements for strings, make some PGM
9 years ago
e480ee0054
Further cleanup of G28 for probes
9 years ago
39883d03fc
universalize axis_unhomed_error()
9 years ago
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!)
9 years ago
829c92f1ba
Use Z_RAISE_BETWEEN_PROBINGS with MBL
9 years ago
eb1755208f
Merge pull request #4153 from thinkyhead/rc_probe_raise_options
...
Combine Z raise before/after options
9 years ago
10da7ac86c
Combine Z raise before/after options
9 years ago
3fa631130f
Ensure a minimum height before XY move in probe_pt
9 years ago
ca184d3d72
Merge pull request #4147 from thinkyhead/rc_fix_M48_raise
...
Fix debug output in probe_pt
9 years ago
b4161cbd98
Fix debug output in probe_pt
9 years ago
da88b00585
MBL: Add support for max z endstop
...
See https://github.com/MarlinFirmware/Marlin/issues/4088
9 years ago
7de7552069
Merge pull request #4133 from MagoKimbra/Single_home_axis_delta
...
Single home Axis Delta need simple sync_plan_position
9 years ago
15a6b49f37
Simplified probe_pt (in G30)
9 years ago
6a7045b9bf
Remove clean_up_after_endstop_move
9 years ago
2a4f866561
Simplified probe_pt (in G29)
9 years ago
89a2aa026b
Simplified probe_pt (in M48)
9 years ago
f8530c5d1f
Simplified probe_pt function (G28 grid)
9 years ago
c376c08042
Simplified probe_pt function (part 1)
9 years ago
9a71b7f8ad
Fix debug message for 3-point leveling
9 years ago
550c03a5a9
Drop raise_z_after_probing function
9 years ago
bb38c816af
Always raise in deploy_z_probe / stow_z_probe
9 years ago
68f3350050
Cleanup M401 / M402
9 years ago
3afda99adf
Regular handlers for G31 / G32
9 years ago
6803c8e37e
Move Z up before, or down after XY, for "blocking move"
9 years ago
570f3bbc07
Single home Axis Delta need simple sync_plan_position
9 years ago
7b2fadd598
Apply some fixes from Andreas
...
Derived from
https://github.com/AnHardt/Marlin/commit/6e8ede8c694fa4d9e3c769840b09d56
7f8d8e0dd
9 years ago
bd01592816
Goodbye MECHANICAL_PROBE
9 years ago
2640d13a9f
Simplify initial raise in M48
9 years ago
3763d45656
Return Z position in run_z_probe
9 years ago
1f48b5c30f
Pass a raise to probe_pt, not a Z position
9 years ago
6fdd5ba246
Save and restore feedrate in more places
9 years ago
fe173c2bc6
Generalized probe raise, use for after probing
9 years ago
7da3080761
Simpler cleanup in G28 / G29
9 years ago
15229d988b
Fix compile error for bed matrix in M48
9 years ago
c01352cbd5
Add a dependency for z servo macros
9 years ago
c3794bd695
Add HAS_PROBING_PROCEDURE conditional
9 years ago
bb9c67b4b5
Tweak some feedrate vars
9 years ago
5158bd6e93
Screen out `G29 E` for sled and allen key, allow single probe
9 years ago
ccae92588d
Cleanup debug in G28 and G29
9 years ago
b4a9d2366c
Use a macro for kinematic sync_plan_position
9 years ago
bfccf26294
Use sync_plan_position_delta where needed
9 years ago
a6b8c67df4
Move probe deploy after setup call in G29
9 years ago
e69916d1bd
Split up endstop_move functions
9 years ago
0e18a4897b
Simpler handling of sled/allen-key in probe_pt
9 years ago
1a92e2ef18
Comment on run_z_probe
9 years ago
68e0e5855e
For all probes, at the end of G29 simply raise and stow
9 years ago
c3023f8cc5
Make M401/M402 available with HAS_BED_PROBE
9 years ago
9f0c255c69
Show uncorrected position in set_bed_level_equation_3pts
9 years ago
07298ac992
Initialize current_position to home_offset on boot
9 years ago
d50539583a
Make XY_PROBE_SPEED a general probe option
9 years ago
2798499b71
XY_TRAVEL_SPEED => XY_PROBE_SPEED
9 years ago
88dc543584
Add a macro for XY_TRAVEL_FEEDRATE
9 years ago
3996242e9d
Allow Z_MIN_PROBE_REPEATABILITY_TEST solo
9 years ago
26a9cd0b08
Move run_z_probe to earlier block
9 years ago
7f8a2025af
Move raise_z_after_probing into earlier block
9 years ago
2530371516
Always disable probe at the end of G29
9 years ago
6aba98e470
Comment on setup_for_endstop_move
9 years ago
04e88d008e
Clear up ordering in G30
9 years ago
ed75b0ea11
Make clean_up function available for probes
9 years ago
51d52cb52a
Make run_z_probe available for any bed probe
9 years ago
f6b09cf465
Always use deploy/stow for dock_sled
9 years ago
3b457c2dd3
Use deploy/stow with FIX_MOUNTED_PROBE too
9 years ago
7e9d4a68d4
Always raise Z (if needed) for servo deploy/stow
9 years ago
9beb3f2f5e
Merge pull request #4097 from thinkyhead/rc_fil_runout_cleanup
...
FIL_RUNOUT_INVERTING false by default
9 years ago
f215b30932
Merge pull request #4093 from thinkyhead/rc_probe_without_abl
...
Make Z Probe options independent of ABL
9 years ago
2fd2301928
FILRUNOUT => FIL_RUNOUT
9 years ago
de12228758
Make Z Probe options independent of ABL
9 years ago
add0032820
Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN
9 years ago
400e13d136
Output a message for SD read errors
9 years ago
96b8bcca84
Merge pull request #4081 from thinkyhead/rc_tweaky_m48_tweaks
...
Cleanup of M48
9 years ago
b7e3c1bbc4
Tweak M48 output conditions
9 years ago
1dad912b03
Adjust M48 raise / move handling
9 years ago
46d3ef2223
Simplify sample_set probe_pt call in M48
9 years ago
a647b05f82
Shrink some debug code in G28
9 years ago
4edf813bde
Just-in-time declaration style in M48
9 years ago
c475291e19
Fix M851
...
Minor change missing in the process of standardize the gcode M851
9 years ago
4e860babbc
Allow setting xy_travel_speed for delta leveling also
9 years ago
d36d4edd80
Tweak partial homing code
9 years ago
d3a05de96e
Save and restore feedrate in probe functions
9 years ago
defcacc1a9
Delete some obsolete Z servo macros
9 years ago
3a150f07c2
Merge pull request #4073 from thinkyhead/rc_temp_mystery
...
Minor tweaks to M109 / M190
9 years ago
bd4ec727e7
Merge pull request #4066 from thinkyhead/rc_M851_with_probe
...
Make M851 standard with a bed probe
9 years ago
692a6e7c91
Merge pull request #4065 from thinkyhead/rc_goodbye_xy_servos
...
Remove support for XY servo endstops
9 years ago
de177ba6c9
Minor tweaks to M109 / M190
9 years ago
1000563d80
Make M851 standard with a bed probe
9 years ago
f66a194159
Merge pull request #4062 from jbrazio/bugfix/compiler-warnings
...
Fixes misc gcc warnings
9 years ago
1bed392c68
HAS_Z_ENDSTOP_SERVO => HAS_Z_SERVO_ENDSTOP
9 years ago
47ce810f52
Remove support for XY servo endstops
9 years ago
d1e5dc6319
Fixes misc gcc warnings
9 years ago
ef3bef6b9e
Fix feedrate in gcode_T (max_feedrate is mm/s)
9 years ago
008d0637dd
Fix gcode_T
9 years ago
da90bbe0eb
Merge pull request #4010 from thinkyhead/rc_toolchange_adjust
...
Fixup position adjustment on toolchange
9 years ago
4b93989a77
MBL Z adjustment on toolchange
9 years ago
Scott Lahteine