浏览代码

Tweaks to tool_change, GcodeSuite::T()

Scott Lahteine 7 年前
父节点
当前提交
c0dddd4233
共有 3 个文件被更改,包括 11 次插入11 次删除
  1. 2
    2
      Marlin/src/gcode/bedlevel/abl/G29.cpp
  2. 2
    2
      Marlin/src/gcode/control/T.cpp
  3. 7
    7
      Marlin/src/module/tool_change.cpp

+ 2
- 2
Marlin/src/gcode/bedlevel/abl/G29.cpp 查看文件

137
     const uint8_t old_debug_flags = marlin_debug_flags;
137
     const uint8_t old_debug_flags = marlin_debug_flags;
138
     if (query) marlin_debug_flags |= DEBUG_LEVELING;
138
     if (query) marlin_debug_flags |= DEBUG_LEVELING;
139
     if (DEBUGGING(LEVELING)) {
139
     if (DEBUGGING(LEVELING)) {
140
-      DEBUG_POS(">>> gcode_G29", current_position);
140
+      DEBUG_POS(">>> G29", current_position);
141
       log_machine_info();
141
       log_machine_info();
142
     }
142
     }
143
     marlin_debug_flags = old_debug_flags;
143
     marlin_debug_flags = old_debug_flags;
957
   if (!faux) clean_up_after_endstop_or_probe_move();
957
   if (!faux) clean_up_after_endstop_or_probe_move();
958
 
958
 
959
   #if ENABLED(DEBUG_LEVELING_FEATURE)
959
   #if ENABLED(DEBUG_LEVELING_FEATURE)
960
-    if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("<<< gcode_G29");
960
+    if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("<<< G29");
961
   #endif
961
   #endif
962
 
962
 
963
   report_current_position();
963
   report_current_position();

+ 2
- 2
Marlin/src/gcode/control/T.cpp 查看文件

37
 
37
 
38
   #if ENABLED(DEBUG_LEVELING_FEATURE)
38
   #if ENABLED(DEBUG_LEVELING_FEATURE)
39
     if (DEBUGGING(LEVELING)) {
39
     if (DEBUGGING(LEVELING)) {
40
-      SERIAL_ECHOPAIR(">>> gcode_T(", tmp_extruder);
40
+      SERIAL_ECHOPAIR(">>> T(", tmp_extruder);
41
       SERIAL_CHAR(')');
41
       SERIAL_CHAR(')');
42
       SERIAL_EOL();
42
       SERIAL_EOL();
43
       DEBUG_POS("BEFORE", current_position);
43
       DEBUG_POS("BEFORE", current_position);
61
   #if ENABLED(DEBUG_LEVELING_FEATURE)
61
   #if ENABLED(DEBUG_LEVELING_FEATURE)
62
     if (DEBUGGING(LEVELING)) {
62
     if (DEBUGGING(LEVELING)) {
63
       DEBUG_POS("AFTER", current_position);
63
       DEBUG_POS("AFTER", current_position);
64
-      SERIAL_ECHOLNPGM("<<< gcode_T");
64
+      SERIAL_ECHOLNPGM("<<< T()");
65
     }
65
     }
66
   #endif
66
   #endif
67
 }
67
 }

+ 7
- 7
Marlin/src/module/tool_change.cpp 查看文件

295
                                     + (tmp_extruder == 0 ? -(PARKING_EXTRUDER_GRAB_DISTANCE) : PARKING_EXTRUDER_GRAB_DISTANCE);
295
                                     + (tmp_extruder == 0 ? -(PARKING_EXTRUDER_GRAB_DISTANCE) : PARKING_EXTRUDER_GRAB_DISTANCE);
296
               /**
296
               /**
297
                *  Steps:
297
                *  Steps:
298
-               *    1. raise Z-Axis to have enough clearance
299
-               *    2. move to park poition of old extruder
300
-               *    3. disengage magnetc field, wait for delay
301
-               *    4. move near new extruder
302
-               *    5. engage magnetic field for new extruder
303
-               *    6. move to parking incl. offset of new extruder
304
-               *    7. lower Z-Axis
298
+               *    1. Raise Z-Axis to give enough clearance
299
+               *    2. Move to park position of old extruder
300
+               *    3. Disengage magnetic field, wait for delay
301
+               *    4. Move near new extruder
302
+               *    5. Engage magnetic field for new extruder
303
+               *    6. Move to parking incl. offset of new extruder
304
+               *    7. Lower Z-Axis
305
                */
305
                */
306
 
306
 
307
               // STEP 1
307
               // STEP 1

正在加载...
取消
保存