Bladeren bron

Move M240 to cpp

Scott Lahteine 7 jaren geleden
bovenliggende
commit
ebb9bd5419
3 gewijzigde bestanden met toevoegingen van 11 en 10 verwijderingen
  1. 0
    4
      Marlin/src/Marlin.cpp
  2. 9
    1
      Marlin/src/gcode/feature/camera/M240.cpp
  3. 2
    5
      Marlin/src/gcode/gcode.cpp

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

@@ -352,10 +352,6 @@ bool pin_is_protected(const int8_t pin) {
352 352
   return false;
353 353
 }
354 354
 
355
-#if defined(CHDK) || HAS_PHOTOGRAPH
356
-  #include "gcode/feature/camera/M240.h"
357
-#endif
358
-
359 355
 #if HAS_LCD_CONTRAST
360 356
   #include "gcode/lcd/M250.h"
361 357
 #endif

Marlin/src/gcode/feature/camera/M240.h → Marlin/src/gcode/feature/camera/M240.cpp Bestand weergeven

@@ -20,11 +20,17 @@
20 20
  *
21 21
  */
22 22
 
23
+#include "../../../inc/MarlinConfig.h"
24
+
25
+#if defined(CHDK) || HAS_PHOTOGRAPH
26
+
27
+#include "../../gcode.h"
28
+
23 29
 /**
24 30
  * M240: Trigger a camera by emulating a Canon RC-1
25 31
  *       See http://www.doc-diy.net/photo/rc-1_hacked/
26 32
  */
27
-void gcode_M240() {
33
+void GcodeSuite::M240() {
28 34
   #ifdef CHDK
29 35
 
30 36
     OUT_WRITE(CHDK, HIGH);
@@ -51,3 +57,5 @@ void gcode_M240() {
51 57
 
52 58
   #endif
53 59
 }
60
+
61
+#endif // CHDK || HAS_PHOTOGRAPH

+ 2
- 5
Marlin/src/gcode/gcode.cpp Bestand weergeven

@@ -119,7 +119,6 @@ void GcodeSuite::dwell(millis_t time) {
119 119
 extern void gcode_M163();
120 120
 extern void gcode_M164();
121 121
 extern void gcode_M165();
122
-extern void gcode_M240();
123 122
 extern void gcode_M250();
124 123
 extern void gcode_M302();
125 124
 extern void gcode_M350();
@@ -576,10 +575,8 @@ void GcodeSuite::process_next_command() {
576 575
       #endif
577 576
 
578 577
       #if defined(CHDK) || HAS_PHOTOGRAPH
579
-        case 240: // M240: Trigger a camera by emulating a Canon RC-1 : http://www.doc-diy.net/photo/rc-1_hacked/
580
-          gcode_M240();
581
-          break;
582
-      #endif // CHDK || PHOTOGRAPH_PIN
578
+        case 240: M240(); break;  // M240: Trigger a camera by emulating a Canon RC-1 : http://www.doc-diy.net/photo/rc-1_hacked/
579
+      #endif
583 580
 
584 581
       #if HAS_LCD_CONTRAST
585 582
         case 250: // M250: Set LCD contrast

Laden…
Annuleren
Opslaan