Consolidate PrintCounter

This commit is contained in:
Scott Lahteine
2017-09-09 00:18:43 -05:00
parent 551752eac7
commit d5fe0fb02b
8 changed files with 33 additions and 28 deletions

View File

@@ -39,12 +39,12 @@
#include "module/temperature.h"
#include "sd/cardreader.h"
#include "module/configuration_store.h"
#include "module/printcounter.h" // PrintCounter or Stopwatch
#ifdef ARDUINO
#include <pins_arduino.h>
#endif
#include <math.h>
#include "libs/nozzle.h"
#include "libs/duration_t.h"
#include "gcode/gcode.h"
#include "gcode/parser.h"
@@ -125,6 +125,7 @@
#include "feature/tmc2130.h"
#endif
bool Running = true;
/**
@@ -166,13 +167,6 @@ millis_t previous_cmd_ms = 0;
static millis_t max_inactive_time = 0;
static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL;
// Print Job Timer
#if ENABLED(PRINTCOUNTER)
PrintCounter print_job_timer = PrintCounter();
#else
Stopwatch print_job_timer = Stopwatch();
#endif
#if ENABLED(Z_DUAL_ENDSTOPS)
float z_endstop_adj;
#endif