Browse Source

Move M117 to cpp

Scott Lahteine 7 years ago
parent
commit
811c32b85a
3 changed files with 5 additions and 7 deletions
  1. 0
    2
      Marlin/src/Marlin.cpp
  2. 1
    4
      Marlin/src/gcode/gcode.cpp
  3. 4
    1
      Marlin/src/gcode/lcd/M117.cpp

+ 0
- 2
Marlin/src/Marlin.cpp View File

355
   return false;
355
   return false;
356
 }
356
 }
357
 
357
 
358
-#include "gcode/lcd/M117.h"
359
-
360
 #include "gcode/host/M118.h"
358
 #include "gcode/host/M118.h"
361
 #include "gcode/host/M119.h"
359
 #include "gcode/host/M119.h"
362
 
360
 

+ 1
- 4
Marlin/src/gcode/gcode.cpp View File

116
 //
116
 //
117
 // Placeholders for non-migrated codes
117
 // Placeholders for non-migrated codes
118
 //
118
 //
119
-extern void gcode_M117();
120
 extern void gcode_M118();
119
 extern void gcode_M118();
121
 extern void gcode_M119();
120
 extern void gcode_M119();
122
 extern void gcode_M120();
121
 extern void gcode_M120();
498
 
497
 
499
       case 115: M115(); break;    // M115: Report capabilities
498
       case 115: M115(); break;    // M115: Report capabilities
500
 
499
 
501
-      case 117: // M117: Set LCD message text, if possible
502
-        gcode_M117();
503
-        break;
500
+      case 117: M117(); break;    // M117: Set LCD message text, if possible
504
       case 118: // M118: Display a message in the host console
501
       case 118: // M118: Display a message in the host console
505
         gcode_M118();
502
         gcode_M118();
506
         break;
503
         break;

Marlin/src/gcode/lcd/M117.h → Marlin/src/gcode/lcd/M117.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../gcode.h"
24
+#include "../../lcd/ultralcd.h"
25
+
23
 /**
26
 /**
24
  * M117: Set LCD Status Message
27
  * M117: Set LCD Status Message
25
  */
28
  */
26
-void gcode_M117() {
29
+void GcodeSuite::M117() {
27
 
30
 
28
   lcd_setstatus(parser.string_arg);
31
   lcd_setstatus(parser.string_arg);
29
 
32
 

Loading…
Cancel
Save