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

Move M105 to cpp

Browse source
This commit is contained in:
Scott Lahteine 2017-09-16 12:25:27 -05:00
parent a41130f854
commit 99c4b9050a
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View file

@ -374,8 +374,6 @@ bool pin_is_protected(const int8_t pin) {
return false; return false;
} }
#include "gcode/temperature/M105.h"
#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED) #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
static uint8_t auto_report_temp_interval; static uint8_t auto_report_temp_interval;

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

@ -124,7 +124,6 @@ extern void gcode_M83();
extern void gcode_M85(); extern void gcode_M85();
extern void gcode_M92(); extern void gcode_M92();
extern void gcode_M100(); extern void gcode_M100();
extern void gcode_M105();
extern void gcode_M106(); extern void gcode_M106();
extern void gcode_M107(); extern void gcode_M107();
extern void gcode_M108(); extern void gcode_M108();
@ -493,7 +492,7 @@ void GcodeSuite::process_next_command() {
case 105: // M105: Report current temperature case 105: // M105: Report current temperature
gcode_M105(); M105();
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
return; // "ok" already printed return; // "ok" already printed

7
Marlin/src/gcode/temperature/M105.h → Marlin/src/gcode/temperature/M105.cpp
View file

@ -20,11 +20,14 @@
* *
*/ */
#include "../gcode.h"
#include "../../module/temperature.h"
/** /**
* M105: Read hot end and bed temperature * M105: Read hot end and bed temperature
*/ */
void gcode_M105() { void GcodeSuite::M105() {
if (gcode.get_target_extruder_from_command()) return; if (get_target_extruder_from_command()) return;
#if HAS_TEMP_HOTEND || HAS_TEMP_BED #if HAS_TEMP_HOTEND || HAS_TEMP_BED
SERIAL_PROTOCOLPGM(MSG_OK); SERIAL_PROTOCOLPGM(MSG_OK);