bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #4374 from thinkyhead/rc_jbrazio_timestamp_t

Browse Source 
Implements timestamp_t structure
This commit is contained in:
Scott Lahteine
2016-07-22 16:08:10 -07:00
committed by GitHub
parent 0b2c608d2f 23043a1e05
commit 179e091473
4 changed files with 168 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@@ -60,6 +60,7 @@
#include "pins_arduino.h"
#include "math.h"
#include "nozzle.h"
#include "timestamp_t.h"
#if ENABLED(USE_WATCHDOG)
#include "watchdog.h"
@@ -4052,22 +4053,15 @@ inline void gcode_M17() {
* M31: Get the time since the start of SD Print (or last M109)
*/
inline void gcode_M31() {
millis_t t = print_job_timer.duration();
int d = int(t / 60 / 60 / 24),
h = int(t / 60 / 60) % 60,
m = int(t / 60) % 60,
s = int(t % 60);
char time[18]; // 123456789012345678
if (d)
sprintf_P(time, PSTR("%id %ih %im %is"), d, h, m, s); // 99d 23h 59m 59s
else
sprintf_P(time, PSTR("%ih %im %is"), h, m, s); // 23h 59m 59s
char buffer[21];
timestamp_t time(print_job_timer.duration());
time.toString(buffer);
lcd_setstatus(time);
lcd_setstatus(buffer);
SERIAL_ECHO_START;
SERIAL_ECHOPGM(MSG_PRINT_TIME " ");
SERIAL_ECHOLN(time);
SERIAL_ECHOLN(buffer);
thermalManager.autotempShutdown();
}