More "zero extruders" changes (#15213)

This commit is contained in:
Scott Lahteine
2019-09-10 02:20:49 -05:00
committed by GitHub
parent 54abf3aeba
commit 584c86bed1
27 changed files with 1068 additions and 841 deletions

View File

@ -23,6 +23,8 @@
#include "../gcode.h"
#include "../../module/planner.h"
#if EXTRUDERS
/**
* M221: Set extrusion percentage (M221 T0 S95)
*/
@ -44,3 +46,5 @@ void GcodeSuite::M221() {
SERIAL_EOL();
}
}
#endif // EXTRUDERS

View File

@ -400,8 +400,18 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 100: M100(); break; // M100: Free Memory Report
#endif
case 104: M104(); break; // M104: Set hot end temperature
case 109: M109(); break; // M109: Wait for hotend temperature to reach target
#if EXTRUDERS
case 104: M104(); break; // M104: Set hot end temperature
case 109: M109(); break; // M109: Wait for hotend temperature to reach target
#endif
case 105: M105(); return; // M105: Report Temperatures (and say "ok")
#if FAN_COUNT > 0
case 106: M106(); break; // M106: Fan On
case 107: M107(); break; // M107: Fan Off
#endif
case 110: M110(); break; // M110: Set Current Line Number
case 111: M111(); break; // M111: Set debug level
@ -410,7 +420,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 112: M112(); break; // M112: Full Shutdown
case 410: M410(); break; // M410: Quickstop - Abort all the planned moves.
#if ENABLED(HOST_PROMPT_SUPPORT)
case 876: M876(); break; // M876: Handle Host prompt responses
case 876: M876(); break; // M876: Handle Host prompt responses
#endif
#else
case 108: case 112: case 410:
@ -434,17 +444,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
//case 191: M191(); break; // M191: Wait for chamber temperature to reach target
#endif
case 105: M105(); return; // M105: Report Temperatures (and say "ok")
#if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR
case 155: M155(); break; // M155: Set temperature auto-report interval
#endif
#if FAN_COUNT > 0
case 106: M106(); break; // M106: Fan On
case 107: M107(); break; // M107: Fan Off
#endif
#if ENABLED(PARK_HEAD_ON_PAUSE)
case 125: M125(); break; // M125: Store current position and move to filament change position
#endif
@ -481,7 +484,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 120: M120(); break; // M120: Enable endstops
case 121: M121(); break; // M121: Disable endstops
#if HAS_LCD_MENU
#if HOTENDS && HAS_LCD_MENU
case 145: M145(); break; // M145: Set material heatup parameters
#endif
@ -553,7 +556,11 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#endif
case 220: M220(); break; // M220: Set Feedrate Percentage: S<percent> ("FR" on your LCD)
case 221: M221(); break; // M221: Set Flow Percentage
#if EXTRUDERS
case 221: M221(); break; // M221: Set Flow Percentage
#endif
case 226: M226(); break; // M226: Wait until a pin reaches a state
#if HAS_SERVOS

View File

@ -543,10 +543,17 @@ private:
static void M100();
#endif
static void M104();
#if EXTRUDERS
static void M104();
static void M109();
#endif
static void M105();
static void M106();
static void M107();
#if FAN_COUNT > 0
static void M106();
static void M107();
#endif
#if DISABLED(EMERGENCY_PARSER)
static void M108();
@ -557,8 +564,6 @@ private:
#endif
#endif
static void M109();
static void M110();
static void M111();
@ -599,7 +604,7 @@ private:
//static void M191();
#endif
#if HAS_LCD_MENU
#if HOTENDS && HAS_LCD_MENU
static void M145();
#endif
@ -660,7 +665,11 @@ private:
#endif
static void M220();
static void M221();
#if EXTRUDERS
static void M221();
#endif
static void M226();
#if ENABLED(PHOTO_GCODE)

View File

@ -22,7 +22,7 @@
#include "../../inc/MarlinConfig.h"
#if HAS_LCD_MENU
#if HOTENDS && HAS_LCD_MENU
#include "../gcode.h"
#include "../../lcd/ultralcd.h"
@ -58,4 +58,4 @@ void GcodeSuite::M145() {
}
}
#endif // HAS_LCD_MENU
#endif // HOTENDS && HAS_LCD_MENU

View File

@ -20,6 +20,10 @@
*
*/
#include "../../inc/MarlinConfigPre.h"
#if EXTRUDERS
#include "../gcode.h"
#include "../../module/temperature.h"
#include "../../module/motion.h"
@ -138,3 +142,5 @@ void GcodeSuite::M109() {
if (set_temp)
(void)thermalManager.wait_for_hotend(target_extruder, no_wait_for_cooling);
}
#endif // EXTRUDERS