bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Cancel Objects - As seen at ERRF2019 (#15590)

Browse Source
This commit is contained in:
Scott Lahteine
2019-10-24 15:35:40 -05:00
committed by GitHub
parent f6a799c7b3
commit 93f0012959
104 changed files with 1015 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/gcode/temperature/M104_M109.cpp
View File

@ -29,10 +29,14 @@
#include "../../module/motion.h"
#include "../../module/planner.h"
#include "../../lcd/ultralcd.h"
#include "../../Marlin.h"
#include "../../Marlin.h" // for startOrResumeJob, etc.
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
#include "../../module/printcounter.h"
#if ENABLED(CANCEL_OBJECTS)
#include "../../feature/cancel_object.h"
#endif
#endif
#if ENABLED(SINGLENOZZLE)
@ -126,7 +130,7 @@ void GcodeSuite::M109() {
ui.reset_status();
}
else
print_job_timer.start();
startOrResumeJob();
#endif
#if HAS_DISPLAY

4
Marlin/src/gcode/temperature/M140_M190.cpp
View File

@ -37,7 +37,7 @@
#include "../../feature/leds/leds.h"
#endif
#include "../../Marlin.h" // for wait_for_heatup and idle()
#include "../../Marlin.h" // for wait_for_heatup, idle, startOrResumeJob
/**
* M140: Set bed temperature
@ -59,7 +59,7 @@ void GcodeSuite::M190() {
thermalManager.setTargetBed(parser.value_celsius());
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
if (parser.value_celsius() > BED_MINTEMP)
print_job_timer.start();
startOrResumeJob();
#endif
}
else return;

4
Marlin/src/gcode/temperature/M141_M191.cpp
View File

@ -38,7 +38,7 @@
#include "../../feature/leds/leds.h"
#endif
#include "../../Marlin.h" // for wait_for_heatup and idle()
#include "../../Marlin.h" // for wait_for_heatup, idle, startOrResumeJob
/**
* M141: Set chamber temperature
@ -60,7 +60,7 @@ void GcodeSuite::M191() {
thermalManager.setTargetChamber(parser.value_celsius());
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
if (parser.value_celsius() > BED_MINTEMP)
print_job_timer.start();
startOrResumeJob();
#endif
}
else return;