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

Enable M191 (#15531)

Browse source
This commit is contained in:
Bo Herrmannsen 2019-10-16 22:02:37 +02:00 committed by Scott Lahteine
parent 40de135d4d
commit 0d7736d663
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/gcode/gcode.cpp
View file

@ -446,7 +446,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#if HAS_HEATED_CHAMBER #if HAS_HEATED_CHAMBER
case 141: M141(); break; // M141: Set chamber temperature case 141: M141(); break; // M141: Set chamber temperature
//case 191: M191(); break; // M191: Wait for chamber temperature to reach target case 191: M191(); break; // M191: Wait for chamber temperature to reach target
#endif #endif
#if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR #if ENABLED(AUTO_REPORT_TEMPERATURES) && HAS_TEMP_SENSOR

2
Marlin/src/gcode/gcode.h
View file

@ -620,7 +620,7 @@ private:
#if HAS_HEATED_CHAMBER #if HAS_HEATED_CHAMBER
static void M141(); static void M141();
//static void M191(); static void M191();
#endif #endif
#if HOTENDS && HAS_LCD_MENU #if HOTENDS && HAS_LCD_MENU

12
Marlin/src/gcode/temperature/M141_M191.cpp
View file

@ -27,7 +27,6 @@
#include "../gcode.h" #include "../gcode.h"
#include "../../module/temperature.h" #include "../../module/temperature.h"
/*
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../lcd/ultralcd.h" #include "../../lcd/ultralcd.h"
@ -40,7 +39,6 @@
#endif #endif
#include "../../Marlin.h" // for wait_for_heatup and idle() #include "../../Marlin.h" // for wait_for_heatup and idle()
*/
/** /**
* M141: Set chamber temperature * M141: Set chamber temperature
@ -54,7 +52,6 @@ void GcodeSuite::M141() {
* M191: Sxxx Wait for chamber current temp to reach target temp. Waits only when heating * M191: Sxxx Wait for chamber current temp to reach target temp. Waits only when heating
* Rxxx Wait for chamber current temp to reach target temp. Waits when heating and cooling * Rxxx Wait for chamber current temp to reach target temp. Waits when heating and cooling
*/ */
/*
void GcodeSuite::M191() { void GcodeSuite::M191() {
if (DEBUGGING(DRYRUN)) return; if (DEBUGGING(DRYRUN)) return;
@ -68,10 +65,11 @@ void GcodeSuite::M191() {
} }
else return; else return;
lcd_setstatusPGM(thermalManager.isHeatingChamber() ? GET_TEXT(MSG_CHAMBER_HEATING) : GET_TEXT(MSG_CHAMBER_COOLING)); const bool is_heating = thermalManager.isHeatingChamber();
if (is_heating || !no_wait_for_cooling) {
thermalManager.wait_for_chamber(no_wait_for_cooling); lcd_setstatusPGM(is_heating ? GET_TEXT(MSG_CHAMBER_HEATING) : GET_TEXT(MSG_CHAMBER_COOLING));
thermalManager.wait_for_chamber(false);
}
} }
*/
#endif // HAS_HEATED_CHAMBER #endif // HAS_HEATED_CHAMBER

2
Marlin/src/module/temperature.cpp
View file

@ -3160,7 +3160,7 @@ void Temperature::isr() {
#endif // HAS_HEATED_BED #endif // HAS_HEATED_BED
#if 0 && HAS_HEATED_CHAMBER #if HAS_HEATED_CHAMBER
#ifndef MIN_COOLING_SLOPE_DEG_CHAMBER #ifndef MIN_COOLING_SLOPE_DEG_CHAMBER
#define MIN_COOLING_SLOPE_DEG_CHAMBER 1.50 #define MIN_COOLING_SLOPE_DEG_CHAMBER 1.50