浏览代码

Mixer - update descriptions (#12108)

AnHardt 6 年前
父节点
当前提交
9ac9649183
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 3
    1
      Marlin/src/gcode/feature/mixing/M163-M165.cpp
  2. 2
    2
      Marlin/src/gcode/gcode.h

+ 3
- 1
Marlin/src/gcode/feature/mixing/M163-M165.cpp 查看文件

43
 
43
 
44
 /**
44
 /**
45
  * M164: Normalize and commit the mix.
45
  * M164: Normalize and commit the mix.
46
- *       If 'S' is given store as a virtual tool. Else in T0.
47
  *
46
  *
48
  *   S[index]   The virtual tool to store
47
  *   S[index]   The virtual tool to store
48
+ *              If 'S' is omitted update the active virtual tool.
49
  */
49
  */
50
 void GcodeSuite::M164() {
50
 void GcodeSuite::M164() {
51
   #if MIXING_VIRTUAL_TOOLS > 1
51
   #if MIXING_VIRTUAL_TOOLS > 1
55
   #endif
55
   #endif
56
   if (WITHIN(tool_index, 0, MIXING_VIRTUAL_TOOLS - 1))
56
   if (WITHIN(tool_index, 0, MIXING_VIRTUAL_TOOLS - 1))
57
     mixer.normalize(tool_index);
57
     mixer.normalize(tool_index);
58
+  else
59
+    mixer.normalize(mixer.get_current_v_tool());
58
 }
60
 }
59
 
61
 
60
 #if ENABLED(DIRECT_MIXING_IN_G1)
62
 #if ENABLED(DIRECT_MIXING_IN_G1)

+ 2
- 2
Marlin/src/gcode/gcode.h 查看文件

146
  * M150 - Set Status LED Color as R<red> U<green> B<blue> P<bright>. Values 0-255. (Requires BLINKM, RGB_LED, RGBW_LED, NEOPIXEL_LED, or PCA9632).
146
  * M150 - Set Status LED Color as R<red> U<green> B<blue> P<bright>. Values 0-255. (Requires BLINKM, RGB_LED, RGBW_LED, NEOPIXEL_LED, or PCA9632).
147
  * M155 - Auto-report temperatures with interval of S<seconds>. (Requires AUTO_REPORT_TEMPERATURES)
147
  * M155 - Auto-report temperatures with interval of S<seconds>. (Requires AUTO_REPORT_TEMPERATURES)
148
  * M163 - Set a single proportion for a mixing extruder. (Requires MIXING_EXTRUDER)
148
  * M163 - Set a single proportion for a mixing extruder. (Requires MIXING_EXTRUDER)
149
- * M164 - Commit the mix (Req. MIXING_EXTRUDER) and optionally save as a virtual tool (Requires MIXING_EXTRUDER)
150
- * M165 - Set the mix for a mixing extruder with parameters ABCDHI. (Requires MIXING_EXTRUDER and DIRECT_MIXING_IN_G1)
149
+ * M164 - Commit the mix and save to a virtual tool (current, or as specified by 'S'). (Requires MIXING_EXTRUDER)
150
+ * M165 - Set the mix for the mixing extruder (and current virtual tool) with parameters ABCDHI. (Requires MIXING_EXTRUDER and DIRECT_MIXING_IN_G1)
151
  * M190 - Sxxx Wait for bed current temp to reach target temp. ** Waits only when heating! **
151
  * M190 - Sxxx Wait for bed current temp to reach target temp. ** Waits only when heating! **
152
  *        Rxxx Wait for bed current temp to reach target temp. ** Waits for heating or cooling. **
152
  *        Rxxx Wait for bed current temp to reach target temp. ** Waits for heating or cooling. **
153
  * M200 - Set filament diameter, D<diameter>, setting E axis units to cubic. (Use S0 to revert to linear units.)
153
  * M200 - Set filament diameter, D<diameter>, setting E axis units to cubic. (Use S0 to revert to linear units.)

正在加载...
取消
保存