瀏覽代碼

Move M115 to cpp

Scott Lahteine 7 年之前
父節點
當前提交
1d2061c935
共有 3 個檔案被更改,包括 7 行新增7 行删除
  1. 0
    2
      Marlin/src/Marlin.cpp
  2. 3
    4
      Marlin/src/gcode/gcode.cpp
  3. 4
    1
      Marlin/src/gcode/host/M115.cpp

+ 0
- 2
Marlin/src/Marlin.cpp 查看文件

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

+ 3
- 4
Marlin/src/gcode/gcode.cpp 查看文件

116
 //
116
 //
117
 // Placeholders for non-migrated codes
117
 // Placeholders for non-migrated codes
118
 //
118
 //
119
-extern void gcode_M115();
120
 extern void gcode_M117();
119
 extern void gcode_M117();
121
 extern void gcode_M118();
120
 extern void gcode_M118();
122
 extern void gcode_M119();
121
 extern void gcode_M119();
496
       case 92: M92(); break;      // M92: Set the steps-per-unit for one or more axes
495
       case 92: M92(); break;      // M92: Set the steps-per-unit for one or more axes
497
 
496
 
498
       case 114: M114(); break;    // M114: Report current position
497
       case 114: M114(); break;    // M114: Report current position
499
-      case 115: // M115: Report capabilities
500
-        gcode_M115();
501
-        break;
498
+
499
+      case 115: M115(); break;    // M115: Report capabilities
500
+
502
       case 117: // M117: Set LCD message text, if possible
501
       case 117: // M117: Set LCD message text, if possible
503
         gcode_M117();
502
         gcode_M117();
504
         break;
503
         break;

Marlin/src/gcode/host/M115.h → Marlin/src/gcode/host/M115.cpp 查看文件

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../gcode.h"
24
+#include "../../inc/MarlinConfig.h"
25
+
23
 /**
26
 /**
24
  * M115: Capabilities string
27
  * M115: Capabilities string
25
  */
28
  */
26
-void gcode_M115() {
29
+void GcodeSuite::M115() {
27
   SERIAL_PROTOCOLLNPGM(MSG_M115_REPORT);
30
   SERIAL_PROTOCOLLNPGM(MSG_M115_REPORT);
28
 
31
 
29
   #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
32
   #if ENABLED(EXTENDED_CAPABILITIES_REPORT)

Loading…
取消
儲存