Merge remote-tracking branch 'refs/remotes/origin/master' into dev

MarlinKimbra/Configuration_Basic.h

@@ -45,8 +45,9 @@
 //#define FIRMWARE_TEST
 
 // Some particular clients re-start sending commands only after receiving a 'wait' when there is a bad serial-connection.
-//#define NO_TIMEOUTS 1000  // Milliseconds
-//#define ADVANCED_OK     // Uncomment to include more info in ok command
+//#define NO_TIMEOUTS
+// Uncomment to include more info in ok command
+//#define ADVANCED_OK
 /***********************************************************************/
 
 
@@ -126,7 +127,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                                    *
  *                                                                                                   *
@@ -135,7 +136,7 @@
  * (but gives greater accuracy and more stable PID)                                                  *
  * Please choose the one that matches your setup.                                                    *
  *                                                                                                   *
- * Temperature sensor settings (1kohm PULLUP):                                                     *
+ * Temperature sensor settings (1kohm PULLUP):                                                       *
  *  51 is 100k thermistor - EPCOS (1k pullup)                                                        *
  *  52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)                                          *
  *  55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)                *
@@ -144,7 +145,7 @@
  *  1010 is Pt1000 with 1k pullup (non standard)                                                     *
  *  147 is Pt100 with 4k7 pullup                                                                     *
  *  110 is Pt100 with 1k pullup (non standard)                                                       *
- *  998 and 999 are Dummy Tables. ALWAYS read 25°C or DUMMY_THERMISTOR_998_VALUE temperature         *
+ *  998 and 999 are Dummy Tables. ALWAYS read 25°C or DUMMY_THERMISTOR_998_VALUE temperature        *
  *                                                                                                   *
  *****************************************************************************************************/
 #define TEMP_SENSOR_0 1
@@ -159,8 +160,8 @@
 #define TEMP_SENSOR_AD595_GAIN   1.0
 
 // Use it for Testing or Development purposes. NEVER for production machine.
-//#define DUMMY_THERMISTOR_998_VALUE 25
-//#define DUMMY_THERMISTOR_999_VALUE 25
+#define DUMMY_THERMISTOR_998_VALUE 25
+#define DUMMY_THERMISTOR_999_VALUE 25
 
 //Show Temperature ADC value
 //The M105 command return, besides traditional information, the ADC value read from temperature sensors.

MarlinKimbra/Configuration_Cartesian.h

@@ -181,7 +181,6 @@
 #define Y_MIN_POS 0
 #define Z_MAX_POS 200
 #define Z_MIN_POS 0
-#define E_MIN_POS 0
 /*****************************************************************************************/
 
 
@@ -268,9 +267,9 @@
 #define ABL_PROBE_PT_1_X 15
 #define ABL_PROBE_PT_1_Y 180
 #define ABL_PROBE_PT_2_X 15
-#define ABL_PROBE_PT_2_Y 20
-#define ABL_PROBE_PT_3_X 170
-#define ABL_PROBE_PT_3_Y 20
+#define ABL_PROBE_PT_2_Y 15
+#define ABL_PROBE_PT_3_X 180
+#define ABL_PROBE_PT_3_Y 15
 // no AUTO_BED_LEVELING_GRID
 
 // Offsets to the probe relative to the extruder tip (Hotend - Probe)
@@ -289,8 +288,8 @@
 //#define Z_PROBE_END_SCRIPT "G1 Z10 F8000\nG1 X10 Y10\nG1 Z0.5"  // These commands will be executed in the end of G29 routine.
                                                                   // Useful to retract a deployable Z probe.
 
-//#define Z_PROBE_SLED                // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
-//#define SLED_DOCKING_OFFSET 5       // the extra distance the X axis must travel to pick up the sled. 0 should be fine but you can push it further if you'd like.
+//#define Z_PROBE_SLED          // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell
+#define SLED_DOCKING_OFFSET 5   // the extra distance the X axis must travel to pick up the sled. 0 should be fine but you can push it further if you'd like.
 /*****************************************************************************************/
 
 
@@ -331,8 +330,8 @@
  ******************************** Manual home positions **********************************
  *****************************************************************************************/
 // The position of the homing switches
-//#define MANUAL_HOME_POSITIONS  // If defined, MANUAL_*_HOME_POS below will be used
-//#define BED_CENTER_AT_0_0  // If defined, the center of the bed is at (X=0, Y=0)
+//#define MANUAL_HOME_POSITIONS   // If defined, MANUAL_*_HOME_POS below will be used
+//#define BED_CENTER_AT_0_0       // If defined, the center of the bed is at (X=0, Y=0)
 
 //Manual homing switch locations:
 #define MANUAL_X_HOME_POS 0

MarlinKimbra/Configuration_Feature.h

@@ -607,7 +607,7 @@
  *                                                                        *
  **************************************************************************/
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
-//#define ABORT_ON_ENDSTOP_HIT_INIT true
+#define ABORT_ON_ENDSTOP_HIT_INIT true
 
 
 /**************************************************************************
@@ -927,9 +927,9 @@
  **********************************************************************************/
 //#define FILAMENT_RUNOUT_SENSOR
 
-#define FILRUNOUT_PIN_INVERTING true        // Should be uncommented and true or false should assigned
-#define ENDSTOPPULLUP_FIL_RUNOUT            // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
-#define FILAMENT_RUNOUT_SCRIPT "M600"       // Script execute when filament run out
+#define FILRUNOUT_PIN_INVERTING true  // Should be uncommented and true or false should assigned
+#define ENDSTOPPULLUP_FIL_RUNOUT      // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
+#define FILAMENT_RUNOUT_SCRIPT "M600" // Script execute when filament run out
 /**********************************************************************************/
 
 

MarlinKimbra/Marlin_main.cpp

@@ -977,7 +977,7 @@ void get_command() {
     static millis_t last_command_time = 0;
     millis_t ms = millis();
 
-    if (!MYSERIAL.available() && commands_in_queue == 0 && ms - last_command_time > NO_TIMEOUTS) {
+    if (!MYSERIAL.available() && commands_in_queue == 0 && ms - last_command_time > 1000UL) {
       ECHO_L(WT);
       last_command_time = ms;
     }

MarlinKimbra/module/cardreader.cpp

 #include "../base.h"
+#include "../Marlin_main.h"
 
 #if ENABLED(SDSUPPORT)
 
-#include "../Marlin_main.h"
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
   #include "vector_3.h"
 #endif