zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tweaks to tool_change, GcodeSuite::T()

Browse source
This commit is contained in:
Scott Lahteine 2017-10-14 02:46:05 -05:00
parent ca66574062
commit c0dddd4233
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -137,7 +137,7 @@ void GcodeSuite::G29() {
const uint8_t old_debug_flags = marlin_debug_flags; const uint8_t old_debug_flags = marlin_debug_flags;
if (query) marlin_debug_flags |= DEBUG_LEVELING; if (query) marlin_debug_flags |= DEBUG_LEVELING;
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
DEBUG_POS(">>> gcode_G29", current_position); DEBUG_POS(">>> G29", current_position);
log_machine_info(); log_machine_info();
} }
marlin_debug_flags = old_debug_flags; marlin_debug_flags = old_debug_flags;
@ -957,7 +957,7 @@ void GcodeSuite::G29() {
if (!faux) clean_up_after_endstop_or_probe_move(); if (!faux) clean_up_after_endstop_or_probe_move();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("<<< gcode_G29"); if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("<<< G29");
#endif #endif
report_current_position(); report_current_position();

4
Marlin/src/gcode/control/T.cpp
View file

@ -37,7 +37,7 @@ void GcodeSuite::T(const uint8_t tmp_extruder) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR(">>> gcode_T(", tmp_extruder); SERIAL_ECHOPAIR(">>> T(", tmp_extruder);
SERIAL_CHAR(')'); SERIAL_CHAR(')');
SERIAL_EOL(); SERIAL_EOL();
DEBUG_POS("BEFORE", current_position); DEBUG_POS("BEFORE", current_position);
@ -61,7 +61,7 @@ void GcodeSuite::T(const uint8_t tmp_extruder) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
DEBUG_POS("AFTER", current_position); DEBUG_POS("AFTER", current_position);
SERIAL_ECHOLNPGM("<<< gcode_T"); SERIAL_ECHOLNPGM("<<< T()");
} }
#endif #endif
} }

14
Marlin/src/module/tool_change.cpp
View file

@ -295,13 +295,13 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
+ (tmp_extruder == 0 ? -(PARKING_EXTRUDER_GRAB_DISTANCE) : PARKING_EXTRUDER_GRAB_DISTANCE); + (tmp_extruder == 0 ? -(PARKING_EXTRUDER_GRAB_DISTANCE) : PARKING_EXTRUDER_GRAB_DISTANCE);
/** /**
* Steps: * Steps:
* 1. raise Z-Axis to have enough clearance * 1. Raise Z-Axis to give enough clearance
* 2. move to park poition of old extruder * 2. Move to park position of old extruder
* 3. disengage magnetc field, wait for delay * 3. Disengage magnetic field, wait for delay
* 4. move near new extruder * 4. Move near new extruder
* 5. engage magnetic field for new extruder * 5. Engage magnetic field for new extruder
* 6. move to parking incl. offset of new extruder * 6. Move to parking incl. offset of new extruder
* 7. lower Z-Axis * 7. Lower Z-Axis
*/ */
// STEP 1 // STEP 1