Bladeren bron

Move M401_M402 to cpp

Scott Lahteine 7 jaren geleden
bovenliggende
commit
1fe25271e4
3 gewijzigde bestanden met toevoegingen van 13 en 15 verwijderingen
  1. 0
    4
      Marlin/src/Marlin.cpp
  2. 3
    9
      Marlin/src/gcode/gcode.cpp
  3. 10
    2
      Marlin/src/gcode/probe/M401_M402.cpp

+ 0
- 4
Marlin/src/Marlin.cpp Bestand weergeven

352
   return false;
352
   return false;
353
 }
353
 }
354
 
354
 
355
-#if HAS_BED_PROBE
356
-  #include "gcode/probe/M401_M402.h"
357
-#endif
358
-
359
 void quickstop_stepper() {
355
 void quickstop_stepper() {
360
   stepper.quick_stop();
356
   stepper.quick_stop();
361
   stepper.synchronize();
357
   stepper.synchronize();

+ 3
- 9
Marlin/src/gcode/gcode.cpp Bestand weergeven

122
 extern void gcode_M350();
122
 extern void gcode_M350();
123
 extern void gcode_M351();
123
 extern void gcode_M351();
124
 extern void gcode_M355();
124
 extern void gcode_M355();
125
-extern void gcode_M401();
126
-extern void gcode_M402();
127
 extern void gcode_M428();
125
 extern void gcode_M428();
128
 extern void gcode_M500();
126
 extern void gcode_M500();
129
 extern void gcode_M501();
127
 extern void gcode_M501();
601
       case 400: M400(); break;    // M400: Finish all moves
599
       case 400: M400(); break;    // M400: Finish all moves
602
 
600
 
603
       #if HAS_BED_PROBE
601
       #if HAS_BED_PROBE
604
-        case 401: // M401: Deploy probe
605
-          gcode_M401();
606
-          break;
607
-        case 402: // M402: Stow probe
608
-          gcode_M402();
609
-          break;
610
-      #endif // HAS_BED_PROBE
602
+        case 401: M401(); break;  // M401: Deploy probe
603
+        case 402: M402(); break;  // M402: Stow probe
604
+      #endif
611
 
605
 
612
       #if ENABLED(FILAMENT_WIDTH_SENSOR)
606
       #if ENABLED(FILAMENT_WIDTH_SENSOR)
613
         case 404:  // M404: Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or display nominal filament width
607
         case 404:  // M404: Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or display nominal filament width

Marlin/src/gcode/probe/M401_M402.h → Marlin/src/gcode/probe/M401_M402.cpp Bestand weergeven

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../../inc/MarlinConfig.h"
24
+
25
+#if HAS_BED_PROBE
26
+
27
+#include "../gcode.h"
28
+#include "../../module/probe.h"
29
+
23
 /**
30
 /**
24
  * M401: Engage Z Servo endstop if available
31
  * M401: Engage Z Servo endstop if available
25
  */
32
  */
26
-void gcode_M401() { DEPLOY_PROBE(); }
33
+void GcodeSuite::M401() { DEPLOY_PROBE(); }
27
 
34
 
28
 /**
35
 /**
29
  * M402: Retract Z Servo endstop if enabled
36
  * M402: Retract Z Servo endstop if enabled
30
  */
37
  */
31
-void gcode_M402() { STOW_PROBE(); }
38
+void GcodeSuite::M402() { STOW_PROBE(); }
32
 
39
 
40
+#endif // HAS_BED_PROBE

Laden…
Annuleren
Opslaan