SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move M149 to cpp

Browse source
This commit is contained in:
Scott Lahteine 2017-09-16 23:15:33 -05:00
parent cbf40f7ee9
commit 0c7ba52451
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/Marlin.cpp
View file

@ -369,10 +369,6 @@ bool pin_is_protected(const int8_t pin) {
return false; return false;
} }
#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
#include "gcode/units/M149.h"
#endif
#if HAS_POWER_SWITCH #if HAS_POWER_SWITCH
#include "gcode/control/M80.h" #include "gcode/control/M80.h"
#endif #endif

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

@ -131,7 +131,6 @@ extern void gcode_M118();
extern void gcode_M119(); extern void gcode_M119();
extern void gcode_M120(); extern void gcode_M120();
extern void gcode_M121(); extern void gcode_M121();
extern void gcode_M149();
extern void gcode_M150(); extern void gcode_M150();
extern void gcode_M163(); extern void gcode_M163();
extern void gcode_M164(); extern void gcode_M164();
@ -547,9 +546,7 @@ void GcodeSuite::process_next_command() {
#endif #endif
#if ENABLED(TEMPERATURE_UNITS_SUPPORT) #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
case 149: // M149: Set temperature units case 149: M149(); break; // M149: Set temperature units
gcode_M149();
break;
#endif #endif
#if HAS_COLOR_LEDS #if HAS_COLOR_LEDS

10
Marlin/src/gcode/units/M149.h → Marlin/src/gcode/units/M149.cpp
View file

@ -20,11 +20,19 @@
* *
*/ */
#include "../../inc/MarlinConfig.h"
#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
#include "../gcode.h"
/** /**
* M149: Set temperature units * M149: Set temperature units
*/ */
void gcode_M149() { void GcodeSuite::M149() {
if (parser.seenval('C')) parser.set_input_temp_units(TEMPUNIT_C); if (parser.seenval('C')) parser.set_input_temp_units(TEMPUNIT_C);
else if (parser.seenval('K')) parser.set_input_temp_units(TEMPUNIT_K); else if (parser.seenval('K')) parser.set_input_temp_units(TEMPUNIT_K);
else if (parser.seenval('F')) parser.set_input_temp_units(TEMPUNIT_F); else if (parser.seenval('F')) parser.set_input_temp_units(TEMPUNIT_F);
} }
#endif // TEMPERATURE_UNITS_SUPPORT