Browse Source

Move M304 to cpp

Scott Lahteine 7 years ago
parent
commit
d4aaa0f1c8
3 changed files with 12 additions and 10 deletions
  1. 0
    4
      Marlin/src/Marlin.cpp
  2. 10
    1
      Marlin/src/gcode/config/M304.cpp
  3. 2
    5
      Marlin/src/gcode/gcode.cpp

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

352
   return false;
352
   return false;
353
 }
353
 }
354
 
354
 
355
-#if ENABLED(PIDTEMPBED)
356
-  #include "gcode/config/M304.h"
357
-#endif
358
-
359
 #if defined(CHDK) || HAS_PHOTOGRAPH
355
 #if defined(CHDK) || HAS_PHOTOGRAPH
360
   #include "gcode/feature/camera/M240.h"
356
   #include "gcode/feature/camera/M240.h"
361
 #endif
357
 #endif

Marlin/src/gcode/config/M304.h → Marlin/src/gcode/config/M304.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
-void gcode_M304() {
23
+#include "../../inc/MarlinConfig.h"
24
+
25
+#if ENABLED(PIDTEMPBED)
26
+
27
+#include "../gcode.h"
28
+#include "../../module/temperature.h"
29
+
30
+void GcodeSuite::M304() {
24
   if (parser.seen('P')) thermalManager.bedKp = parser.value_float();
31
   if (parser.seen('P')) thermalManager.bedKp = parser.value_float();
25
   if (parser.seen('I')) thermalManager.bedKi = scalePID_i(parser.value_float());
32
   if (parser.seen('I')) thermalManager.bedKi = scalePID_i(parser.value_float());
26
   if (parser.seen('D')) thermalManager.bedKd = scalePID_d(parser.value_float());
33
   if (parser.seen('D')) thermalManager.bedKd = scalePID_d(parser.value_float());
32
   SERIAL_ECHOPAIR(" i:", unscalePID_i(thermalManager.bedKi));
39
   SERIAL_ECHOPAIR(" i:", unscalePID_i(thermalManager.bedKi));
33
   SERIAL_ECHOLNPAIR(" d:", unscalePID_d(thermalManager.bedKd));
40
   SERIAL_ECHOLNPAIR(" d:", unscalePID_d(thermalManager.bedKd));
34
 }
41
 }
42
+
43
+#endif // PIDTEMPBED

+ 2
- 5
Marlin/src/gcode/gcode.cpp View File

122
 extern void gcode_M240();
122
 extern void gcode_M240();
123
 extern void gcode_M250();
123
 extern void gcode_M250();
124
 extern void gcode_M302();
124
 extern void gcode_M302();
125
-extern void gcode_M304();
126
 extern void gcode_M350();
125
 extern void gcode_M350();
127
 extern void gcode_M351();
126
 extern void gcode_M351();
128
 extern void gcode_M355();
127
 extern void gcode_M355();
573
       #endif
572
       #endif
574
 
573
 
575
       #if ENABLED(PIDTEMPBED)
574
       #if ENABLED(PIDTEMPBED)
576
-        case 304: // M304: Set bed PID parameters
577
-          gcode_M304();
578
-          break;
579
-      #endif // PIDTEMPBED
575
+        case 304: M304(); break;  // M304: Set bed PID parameters
576
+      #endif
580
 
577
 
581
       #if defined(CHDK) || HAS_PHOTOGRAPH
578
       #if defined(CHDK) || HAS_PHOTOGRAPH
582
         case 240: // M240: Trigger a camera by emulating a Canon RC-1 : http://www.doc-diy.net/photo/rc-1_hacked/
579
         case 240: // M240: Trigger a camera by emulating a Canon RC-1 : http://www.doc-diy.net/photo/rc-1_hacked/

Loading…
Cancel
Save