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

Move M140, M190 to cpp

Browse Source
This commit is contained in:
Scott Lahteine
2017-09-16 22:13:32 -05:00
parent 5b3e49babd
commit 7479ff98b7
5 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/src/gcode/temperature/M140.h → Marlin/src/gcode/temperature/M140.cpp
View File

@ -20,10 +20,19 @@
*
*/
#include "../../inc/MarlinConfig.h"
#if HAS_HEATER_BED && HAS_TEMP_BED
#include "../gcode.h"
#include "../../module/temperature.h"
/**
* M140: Set bed temperature
*/
void gcode_M140() {
void GcodeSuite::M140() {
if (DEBUGGING(DRYRUN)) return;
if (parser.seenval('S')) thermalManager.setTargetBed(parser.value_celsius());
}
#endif // HAS_HEATER_BED && HAS_TEMP_BED

25
Marlin/src/gcode/temperature/M190.h → Marlin/src/gcode/temperature/M190.cpp
View File

@ -20,7 +20,24 @@
*
*/
#include "../../inc/MarlinConfig.h"
#if HAS_HEATER_BED && HAS_TEMP_BED
#include "../gcode.h"
#include "../../module/motion.h"
#include "../../module/temperature.h"
#include "../../lcd/ultralcd.h"
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
#include "../../module/printcounter.h"
#endif
#if ENABLED(PRINTER_EVENT_LEDS)
#include "../../feature/leds/leds.h"
#endif
#include "../../Marlin.h" // for wait_for_heatup and idle()
#ifndef MIN_COOLING_SLOPE_DEG_BED
#define MIN_COOLING_SLOPE_DEG_BED 1.50
@ -33,7 +50,7 @@
* M190: Sxxx Wait for bed current temp to reach target temp. Waits only when heating
* Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
*/
void gcode_M190() {
void GcodeSuite::M190() {
if (DEBUGGING(DRYRUN)) return;
LCD_MESSAGEPGM(MSG_BED_HEATING);
@ -65,7 +82,7 @@ void gcode_M190() {
KEEPALIVE_STATE(NOT_BUSY);
#endif
gcode.target_extruder = active_extruder; // for print_heaterstates
target_extruder = active_extruder; // for print_heaterstates
#if ENABLED(PRINTER_EVENT_LEDS)
const float start_temp = thermalManager.degBed();
@ -97,7 +114,7 @@ void gcode_M190() {
}
idle();
gcode.refresh_cmd_timeout(); // to prevent stepper_inactive_time from running out
refresh_cmd_timeout(); // to prevent stepper_inactive_time from running out
const float temp = thermalManager.degBed();
@ -149,3 +166,5 @@ void gcode_M190() {
KEEPALIVE_STATE(IN_HANDLER);
#endif
}
#endif // HAS_HEATER_BED && HAS_TEMP_BED