CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds an option to disable print job timer auto start

Browse Source
This commit is contained in:
João Brázio 2016-05-14 22:04:53 +01:00 committed by Scott Lahteine
parent a79267217b
commit 8a18c52002
2 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/Configuration.h
View File

@ -755,6 +755,19 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#define ABS_PREHEAT_HPB_TEMP 110 #define ABS_PREHEAT_HPB_TEMP 110
#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255 #define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
//
// Print job timer
//
// This options allows you configure if the print job timer should automatically
// start and stop counting when a M104 or M109 is received.
//
// If disabled you can control the print timer start and stop using the
// following G-Code list:
//
// - M75 - Start the print job timer
// - M76 - Pause the print job timer
// - M77 - Stop the print job timer
#defined PRINTJOB_TIMER_AUTOSTART
// //
// Print Counter // Print Counter

76
Marlin/Marlin_main.cpp
View File

@ -4248,23 +4248,17 @@ inline void gcode_M42() {
/** /**
* M75: Start print timer * M75: Start print timer
*/ */
inline void gcode_M75() { inline void gcode_M75() { print_job_timer.start(); }
print_job_timer.start();
}
/** /**
* M76: Pause print timer * M76: Pause print timer
*/ */
inline void gcode_M76() { inline void gcode_M76() { print_job_timer.pause(); }
print_job_timer.pause();
}
/** /**
* M77: Stop print timer * M77: Stop print timer
*/ */
inline void gcode_M77() { inline void gcode_M77() { print_job_timer.stop(); }
print_job_timer.stop();
}
#if ENABLED(PRINTCOUNTER) #if ENABLED(PRINTCOUNTER)
/*+ /*+
@ -4293,21 +4287,23 @@ inline void gcode_M104() {
thermalManager.setTargetHotend(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset, 1); thermalManager.setTargetHotend(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset, 1);
#endif #endif
/** #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
* We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot /**
* stand by mode, for instance in a dual extruder setup, without affecting * We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot
* the running print timer. * stand by mode, for instance in a dual extruder setup, without affecting
*/ * the running print timer.
if (temp <= (EXTRUDE_MINTEMP)/2) { */
print_job_timer.stop(); if (temp <= (EXTRUDE_MINTEMP)/2) {
LCD_MESSAGEPGM(WELCOME_MSG); print_job_timer.stop();
} LCD_MESSAGEPGM(WELCOME_MSG);
/** }
* We do not check if the timer is already running because this check will /**
* be done for us inside the Stopwatch::start() method thus a running timer * We do not check if the timer is already running because this check will
* will not restart. * be done for us inside the Stopwatch::start() method thus a running timer
*/ * will not restart.
else print_job_timer.start(); */
else print_job_timer.start();
#endif
if (temp > thermalManager.degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING); if (temp > thermalManager.degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING);
} }
@ -4446,21 +4442,23 @@ inline void gcode_M109() {
thermalManager.setTargetHotend(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset, 1); thermalManager.setTargetHotend(temp == 0.0 ? 0.0 : temp + duplicate_extruder_temp_offset, 1);
#endif #endif
/** #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
* We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot /**
* stand by mode, for instance in a dual extruder setup, without affecting * We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot
* the running print timer. * stand by mode, for instance in a dual extruder setup, without affecting
*/ * the running print timer.
if (temp <= (EXTRUDE_MINTEMP)/2) { */
print_job_timer.stop(); if (temp <= (EXTRUDE_MINTEMP)/2) {
LCD_MESSAGEPGM(WELCOME_MSG); print_job_timer.stop();
} LCD_MESSAGEPGM(WELCOME_MSG);
/** }
* We do not check if the timer is already running because this check will /**
* be done for us inside the Stopwatch::start() method thus a running timer * We do not check if the timer is already running because this check will
* will not restart. * be done for us inside the Stopwatch::start() method thus a running timer
*/ * will not restart.
else print_job_timer.start(); */
else print_job_timer.start();
#endif
if (temp > thermalManager.degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING); if (temp > thermalManager.degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING);
} }