Fix #56

MKFirmware · Dec 21, 2016 · e7971ad · e7971ad
1 parent 0b4534a
commit e7971ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/MK4duo/Configuration_Temperature.h b/MK4duo/Configuration_Temperature.h
@@ -82,7 +82,7 @@
  *  10 is 100k RS thermistor 198-961 (4.7k pullup)                                                   *
  *  11 is 100k beta 3950 1% thermistor (4.7k pullup)                                                 *
  *  12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)       *
- *  13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"            *
+ *  13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"            *
  *  20 is the PT100 circuit found in the Ultimainboard V2.x                                          *
  *  60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950                                    *
  *  66 is 4.7M High Temperature thermistor from Dyze Design                                          *
@@ -100,8 +100,8 @@
  *  110 is Pt100 with 1k pullup (non standard)                                                       *
  *                                                                                                   *
  *         Use these for Testing or Development purposes. NEVER for production machine.              *
- *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.                      *
- *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.                     *
+ *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.                      *
+ *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.                     *
  *                                                                                                   *
  *****************************************************************************************************/
 #define TEMP_SENSOR_0 1

diff --git a/MK4duo/src/MK_Main.cpp b/MK4duo/src/MK_Main.cpp
@@ -5074,7 +5074,6 @@ inline void gcode_G28() {
             }
           #endif
 
-          //idle();
         } while ((bed_level_c < -ac_prec) or (bed_level_c > ac_prec)
               or (bed_level_x < -ac_prec) or (bed_level_x > ac_prec)
               or (bed_level_y < -ac_prec) or (bed_level_y > ac_prec)
@@ -11417,9 +11416,9 @@ static void report_current_position() {
     static millis_t lastMotor = 0;      // Last time a motor was turned on
     static millis_t lastMotorCheck = 0; // Last time the state was checked
     millis_t ms = millis();
-    if (ms >= lastMotorCheck + 2500) { // Not a time critical function, so we only check every 2500ms
-      lastMotorCheck = ms;
-      if (X_ENABLE_READ == X_ENABLE_ON || Y_ENABLE_READ == Y_ENABLE_ON || Z_ENABLE_READ == Z_ENABLE_ON || soft_pwm_bed > 0
+    if (ELAPSED(ms, nextMotorCheck)) {
+      nextMotorCheck = ms + 2500UL; // Not a time critical function, so only check every 2.5s
+      if (X_ENABLE_READ == X_ENABLE_ON || Y_ENABLE_READ == Y_ENABLE_ON || Z_ENABLE_READ == Z_ENABLE_ON || thermalManager.soft_pwm_bed > 0
         || E0_ENABLE_READ == E_ENABLE_ON // If any of the drivers are enabled...
         #if EXTRUDERS > 1
           || E1_ENABLE_READ == E_ENABLE_ON