MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
e616093d4c
Firmware2/Marlin
History
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
..
example_configurations Combine Z raise before/after options 2016-06-26 13:56:30 -07:00
fonts Rename README file for fonts 2016-04-18 20:09:03 -07:00
blinkm.cpp
blinkm.h
boards.h Cartesio UI Support 2016-06-15 21:46:54 -07:00
buzzer.h Heal the watchgog 2016-06-12 00:34:31 +02:00
cardreader.cpp Add an SD Card stop function, use in ultralcd 2016-06-17 18:27:14 -07:00
cardreader.h Add an SD Card stop function, use in ultralcd 2016-06-17 18:27:14 -07:00
circularqueue.h Non-blocking buzzer 2016-06-09 20:20:05 -07:00
Conditionals.h CARTESIO_UI has lcd contrast 2016-06-27 12:04:49 -07:00
Configuration_adv.h Fix comments on EXPERIMENTAL_I2CBUS 2016-06-21 17:58:44 -07:00
configuration_store.cpp Tweak some feedrate vars 2016-06-22 03:27:31 -07:00
configuration_store.h
Configuration.h Combine Z raise before/after options 2016-06-26 13:56:30 -07:00
dac_mcp4728.cpp
dac_mcp4728.h
digipot_mcp4451.cpp
dogm_bitmaps.h SINGLENOZZLE: EXTRUDERS versus HOTENDS 2016-06-03 17:38:03 -07:00
dogm_custom_bitmaps.h Custom Splash Screen 2016-06-14 09:39:28 +02:00
dogm_font_data_6x9_marlin.h
dogm_font_data_HD44780_C.h
dogm_font_data_HD44780_J.h
dogm_font_data_HD44780_W.h
dogm_font_data_ISO10646_1.h
dogm_font_data_ISO10646_5_Cyrillic.h
dogm_font_data_ISO10646_CN.h
dogm_font_data_ISO10646_Kana.h
dogm_font_data_Marlin_symbols.h
dogm_lcd_implementation.h Fixes somes compiler warnings 2016-06-23 03:12:55 +01:00
endstops.cpp This fix is not DELTA compatible 2016-06-02 17:16:19 -07:00
endstops.h Drop FORCE_INLINE from endstops.h 2016-05-30 17:08:56 -07:00
fastio.h Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
language_an.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_bg.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_ca.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_cn.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_cz.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_da.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_de.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_en.h XYZ unhomed 2016-05-17 17:02:53 -07:00
language_es.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_eu.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_fi.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_fr.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_gl.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_hr.h Tweak Croatian language file heading 2016-06-16 16:09:57 -07:00
language_it.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_kana_utf8.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_kana.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_nl.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_pl.h Update language_pl.h 2016-05-20 13:24:34 +02:00
language_pt_utf8.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_pt-br_utf8.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_pt-br.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_pt.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_ru.h Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
language_test.h
language.h Output a message for SD read errors 2016-06-19 17:14:56 -07:00
M100_Free_Mem_Chk.cpp Remove redundant declarations from M100 code 2016-06-08 17:09:34 -07:00
macros.h Automatically set X2 stepper pins 2016-05-18 19:09:09 -07:00
Makefile Merge pull request #3224 from yarda/fix-melzi2-arduino-1.6.x 2016-05-08 19:33:37 -07:00
Marlin_main.cpp Simplify dock_sled() 2016-06-27 20:19:51 -07:00
Marlin.h Tweak some feedrate vars 2016-06-22 03:27:31 -07:00
Marlin.ino
MarlinSerial.cpp
MarlinSerial.h Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
mesh_bed_leveling.cpp Use memset in mbl.reset to save 58 bytes 2016-06-08 16:05:18 -07:00
mesh_bed_leveling.h MBL: cel => cell 2016-06-07 19:10:39 -07:00
pins_3DRAG.h Updated multiple pins files 2016-04-24 05:21:17 +01:00
pins_5DPRINT.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_99.h Cleanup pins files, fixup analogtodigitalpin, etc. 2016-05-08 12:38:00 -07:00
pins_A4JP.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_AZTEEG_X1.h
pins_AZTEEG_X3_PRO.h Use #undef in AZTEEG_X3_PRO for RAMPS overrides 2016-05-01 13:49:32 -07:00
pins_AZTEEG_X3.h
pins_BAM_DICE_DUE.h
pins_BQ_ZUM_MEGA_3D.h Fix BQ_LCD_SMART_CONTROLLER pin compiler warnings 2016-06-09 20:38:23 -07:00
pins_BRAINWAVE_PRO.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_BRAINWAVE.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_CHEAPTRONIC.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_CNCONTROLS_12.h FILRUNOUT => FIL_RUNOUT 2016-06-19 19:25:26 -07:00
pins_ELEFU_3.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_FELIX2.h
pins_GEN3_MONOLITHIC.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_GEN3_PLUS.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_GEN6_DELUXE.h
pins_GEN6.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_GEN7_12.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_GEN7_13.h
pins_GEN7_14.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_GEN7_CUSTOM.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_K8200.h Updated multiple pins files 2016-04-24 05:21:17 +01:00
pins_LEAPFROG.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_MEGACONTROLLER.h SINGLENOZZLE: EXTRUDERS versus HOTENDS 2016-06-03 17:38:03 -07:00
pins_MEGATRONICS_2.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_MEGATRONICS_3.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_MEGATRONICS.h Non-blocking buzzer 2016-06-09 20:20:05 -07:00
pins_MELZI_MAKR3D.h
pins_MELZI.h
pins_MINIRAMBO.h Non-blocking buzzer 2016-06-09 20:20:05 -07:00
pins_MINITRONICS.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_MKS_13.h
pins_MKS_BASE.h
pins_OMCA_A.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_OMCA.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_PRINTRBOARD_REVF.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_PRINTRBOARD.h Non-blocking buzzer 2016-06-09 20:20:05 -07:00
pins_RAMBO.h Non-blocking buzzer 2016-06-09 20:20:05 -07:00
pins_RAMPS_13_EFB.h
pins_RAMPS_13.h
pins_RAMPS_14_EFB.h
pins_RAMPS_14.h FILRUNOUT => FIL_RUNOUT 2016-06-19 19:25:26 -07:00
pins_RAMPS_OLD.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_RIGIDBOARD.h
pins_RUMBA.h SINGLENOZZLE: EXTRUDERS versus HOTENDS 2016-06-03 17:38:03 -07:00
pins_SAINSMART_2IN1.h
pins_SANGUINOLOLU_11.h Non-blocking buzzer 2016-06-09 20:20:05 -07:00
pins_SANGUINOLOLU_12.h
pins_SAV_MKI.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_SETHI.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_STB_11.h
pins_TEENSY2.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_TEENSYLU.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_ULTIMAIN_2.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_ULTIMAKER_OLD.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins_ULTIMAKER.h Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 2016-05-14 15:49:22 -07:00
pins.h Cartesio UI Support 2016-06-15 21:46:54 -07:00
planner_bezier.cpp Update comments, rename next_ping_ms, followup to #3797 2016-05-19 16:44:57 -07:00
planner_bezier.h Add BEZIER_CURVE_SUPPORT (G5 XYZEFIJPQ) 2016-05-14 14:52:08 -07:00
planner.cpp Fixes somes compiler warnings 2016-06-23 03:12:55 +01:00
planner.h Fix feedrate in gcode_T (max_feedrate is mm/s) 2016-06-16 16:03:14 -07:00
printcounter.cpp Closes #3826: SD printing will now pause and stop the print counter 2016-05-30 00:56:39 +01:00
printcounter.h Followup for #3813 2016-05-22 13:14:58 +01:00
qr_solve.cpp
qr_solve.h
SanityCheck.h SERVO_DEACTIVATION_DELAY => SERVO_DELAY 2016-06-23 14:33:29 -07:00
Sd2Card.cpp Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
Sd2Card.h Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
Sd2PinMap.h Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
SdBaseFile.cpp 8.3-filenames second try 2016-05-02 15:58:04 +02:00
SdBaseFile.h
SdFatConfig.h
SdFatStructs.h
SdFatUtil.cpp
SdFatUtil.h Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
SdFile.cpp Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
SdFile.h
SdInfo.h Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
SdVolume.cpp Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
SdVolume.h
servo.cpp SERVO_DEACTIVATION_DELAY => SERVO_DELAY 2016-06-23 14:33:29 -07:00
servo.h SERVO_DEACTIVATION_DELAY => SERVO_DELAY 2016-06-23 14:33:29 -07:00
speaker.h Non-blocking buzzer 2016-06-09 20:20:05 -07:00
speed_lookuptable.h
stepper_dac.cpp
stepper_dac.h
stepper_indirection.cpp
stepper_indirection.h Automatically set X2 stepper pins 2016-05-18 19:09:09 -07:00
stepper.cpp Merge pull request #4125 from jbrazio/bugfix/planner-warning 2016-06-22 19:34:37 -07:00
stepper.h make motor_current_setting static and constexpr 2016-06-21 19:50:08 -07:00
stopwatch.cpp Fixes #3809 and adds several improvements to the Stopwatch and 2016-05-22 01:59:59 +01:00
stopwatch.h Fixes #3809 and adds several improvements to the Stopwatch and 2016-05-22 01:59:59 +01:00
temperature.cpp Fixes somes compiler warnings 2016-06-23 03:12:55 +01:00
temperature.h Fix compile error with watch_bed_next_ms 2016-06-21 02:13:41 -07:00
thermistortables.h Cosmetic changes and small fix for thermistortables.h 2016-06-21 21:19:47 +09:00
twibus.cpp Shrink debug code in TWIBus and disable by default 2016-04-20 12:44:30 -07:00
twibus.h Shrink debug code in TWIBus and disable by default 2016-04-20 12:44:30 -07:00
ultralcd_implementation_hitachi_HD44780.h Introduce save_delay() 2016-06-15 18:11:55 +02:00
ultralcd_st7920_u8glib_rrd.h Squish code in ST7920 2016-06-25 18:35:15 -07:00
ultralcd.cpp MBL: Add support for max z endstop 2016-06-25 21:58:02 +02:00
ultralcd.h Show bootscreen later 2016-06-14 01:59:50 +02:00
utf_mapper.h Tweaks to some verbiage 2016-05-14 15:06:09 -07:00
vector_3.cpp
vector_3.h
Version.h Updated all example configuration files 2016-06-12 00:36:15 +01:00
watchdog.cpp
watchdog.h