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
 /***********************************************************************/
 
 
@@ -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)
@@ -290,7 +289,7 @@
                                                                   // 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 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.
 /*****************************************************************************************/
 
 

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
 
 
 /**************************************************************************

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