MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Move M31 to cpp

Browse Source
This commit is contained in:
Scott Lahteine 2017-09-16 03:32:16 -05:00
parent a442c34a1a
commit 69b664b6fe
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View File

@ -360,8 +360,6 @@ void suicide() {
***************** GCode Handlers ***************** ***************** GCode Handlers *****************
**************************************************/ **************************************************/
#include "gcode/stats/M31.h" // M31: Get the time since the start of SD Print (or last M109)
/** /**
* Sensitive pin test for M42, M226 * Sensitive pin test for M42, M226
*/ */

4
Marlin/src/gcode/gcode.cpp
View File

@ -117,7 +117,6 @@ void GcodeSuite::dwell(millis_t time) {
// Placeholders for non-migrated codes // Placeholders for non-migrated codes
// //
extern void gcode_M18_M84(); extern void gcode_M18_M84();
extern void gcode_M31();
extern void gcode_M42(); extern void gcode_M42();
extern void gcode_M43(); extern void gcode_M43();
extern void gcode_M48(); extern void gcode_M48();
@ -432,8 +431,7 @@ void GcodeSuite::process_next_command() {
case 928: M928(); break; // M928: Start SD write case 928: M928(); break; // M928: Start SD write
#endif // SDSUPPORT #endif // SDSUPPORT
case 31: // M31: Report time since the start of SD print or last M109 case 31: M31(); break; // M31: Report time since the start of SD print or last M109
gcode_M31(); break;
case 42: // M42: Change pin state case 42: // M42: Change pin state
gcode_M42(); break; gcode_M42(); break;

8
Marlin/src/gcode/stats/M31.h → Marlin/src/gcode/stats/M31.cpp
View File

@ -20,10 +20,16 @@
* *
*/ */
#include "../gcode.h"
#include "../../core/serial.h"
#include "../../module/printcounter.h"
#include "../../libs/duration_t.h"
#include "../../lcd/ultralcd.h"
/** /**
* M31: Get the time since the start of SD Print (or last M109) * M31: Get the time since the start of SD Print (or last M109)
*/ */
void gcode_M31() { void GcodeSuite::M31() {
char buffer[21]; char buffer[21];
duration_t elapsed = print_job_timer.duration(); duration_t elapsed = print_job_timer.duration();
elapsed.toString(buffer); elapsed.toString(buffer);