Kaynağa Gözat

Move M48 to cpp

Scott Lahteine 7 yıl önce
ebeveyn
işleme
fc52fc72ac

+ 0
- 4
Marlin/src/Marlin.cpp Dosyayı Görüntüle

370
   return false;
370
   return false;
371
 }
371
 }
372
 
372
 
373
-#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
374
-  #include "gcode/calibrate/M48.h"
375
-#endif
376
-
377
 #include "gcode/stats/M75.h"
373
 #include "gcode/stats/M75.h"
378
 #include "gcode/stats/M76.h"
374
 #include "gcode/stats/M76.h"
379
 #include "gcode/stats/M77.h"
375
 #include "gcode/stats/M77.h"

Marlin/src/gcode/calibrate/M48.h → Marlin/src/gcode/calibrate/M48.cpp Dosyayı Görüntüle

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../../inc/MarlinConfig.h"
24
+
25
+#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
26
+
27
+#include "../gcode.h"
28
+#include "../../module/motion.h"
29
+#include "../../module/probe.h"
30
+
31
+#if DISABLED(DELTA)
32
+  #include "../../feature/bedlevel/bedlevel.h"
33
+#endif
34
+
23
 /**
35
 /**
24
  * M48: Z probe repeatability measurement function.
36
  * M48: Z probe repeatability measurement function.
25
  *
37
  *
38
  * Any information generated by a prior G29 Bed leveling command will be lost and need to be
50
  * Any information generated by a prior G29 Bed leveling command will be lost and need to be
39
  * regenerated.
51
  * regenerated.
40
  */
52
  */
41
-void gcode_M48() {
53
+void GcodeSuite::M48() {
42
 
54
 
43
   if (axis_unhomed_error()) return;
55
   if (axis_unhomed_error()) return;
44
 
56
 
271
 
283
 
272
   report_current_position();
284
   report_current_position();
273
 }
285
 }
286
+
287
+#endif // Z_MIN_PROBE_REPEATABILITY_TEST

+ 2
- 5
Marlin/src/gcode/gcode.cpp Dosyayı Görüntüle

117
 // Placeholders for non-migrated codes
117
 // Placeholders for non-migrated codes
118
 //
118
 //
119
 extern void gcode_M18_M84();
119
 extern void gcode_M18_M84();
120
-extern void gcode_M48();
121
 extern void gcode_M75();
120
 extern void gcode_M75();
122
 extern void gcode_M76();
121
 extern void gcode_M76();
123
 extern void gcode_M77();
122
 extern void gcode_M77();
438
       #endif
437
       #endif
439
 
438
 
440
       #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
439
       #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
441
-        case 48: // M48: Z probe repeatability test
442
-          gcode_M48();
443
-          break;
444
-      #endif // Z_MIN_PROBE_REPEATABILITY_TEST
440
+        case 48: M48(); break;    // M48: Z probe repeatability test
441
+      #endif
445
 
442
 
446
       #if ENABLED(UBL_G26_MESH_VALIDATION)
443
       #if ENABLED(UBL_G26_MESH_VALIDATION)
447
         case 49: M49(); break;    // M49: Turn on or off G26 debug flag for verbose output
444
         case 49: M49(); break;    // M49: Turn on or off G26 debug flag for verbose output

Loading…
İptal
Kaydet