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

MK/Configuration_Cartesian.h

@@ -15,8 +15,8 @@
  * - Disables axis
  * - Travel limits
  * - Axis relative mode
- * - MBL or ABL
- * - Auto bed levelling
+ * - Mesh Bed Leveling (MBL)
+ * - Auto Bed Leveling (ABL)
  * - Z probe endstop
  * - Safe Z homing
  * - Manual home positions
@@ -28,6 +28,7 @@
  * - Cartesian Correction
  *
  * Basic-settings can be found in Configuration_Basic.h
+ * Temperature-settings can be found in Configuration_Temperature.h
  * Feature-settings can be found in Configuration_Feature.h
  * Pins-settings can be found in "Configuration_Pins.h"
  */
@@ -229,24 +230,7 @@
 
 
 /*****************************************************************************************
- ************************************** MBL or ABL ***************************************
- *****************************************************************************************
- *                                                                                       *
- * Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings                         *
- * Set the rectangle in which to probe in MBL or ABL.                                    *
- *                                                                                       *
- *****************************************************************************************/
-#define LEFT_PROBE_BED_POSITION 20
-#define RIGHT_PROBE_BED_POSITION 180
-#define FRONT_PROBE_BED_POSITION 20
-#define BACK_PROBE_BED_POSITION 180
-
-#define XY_TRAVEL_SPEED 10000     // X and Y axis travel speed between probes, in mm/min
-/*****************************************************************************************/
-
-
-/*****************************************************************************************
- ******************************* Mesh bed leveling ***************************************
+ ******************************* Mesh Bed Leveling ***************************************
  *****************************************************************************************/
 //#define MESH_BED_LEVELING
 
@@ -266,7 +250,7 @@
 
 
 /*****************************************************************************************
- ******************************* Auto bed leveling ***************************************
+ ******************************* Auto Bed Leveling ***************************************
  *****************************************************************************************
  *                                                                                       *
  * There are 2 different ways to specify probing locations                               *
@@ -281,7 +265,7 @@
  *   You specify the XY coordinates of all 3 points.                                     *
  *                                                                                       *
  *                                                                                       *
- * Uncomment AUTO_BED_LEVELING_FEATURE to enable                                         *
+ * Uncomment AUTO BED LEVELING FEATURE to enable                                         *
  *                                                                                       *
  *****************************************************************************************/
 //#define AUTO_BED_LEVELING_FEATURE
@@ -291,14 +275,22 @@
 // Note: this feature generates 10KB extra code size
 #define AUTO_BED_LEVELING_GRID
 
-// yes AUTO_BED_LEVELING_GRID
-#define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
+// START yes AUTO BED LEVELING GRID
+#define LEFT_PROBE_BED_POSITION 20
+#define RIGHT_PROBE_BED_POSITION 180
+#define FRONT_PROBE_BED_POSITION 20
+#define BACK_PROBE_BED_POSITION 180
+
+// The probe square sides can be no smaller than this
+#define MIN_PROBE_EDGE 10
+
 // Set the number of grid points per dimension
 // You probably don't need more than 3 (squared=9)
 #define AUTO_BED_LEVELING_GRID_POINTS 2
-// yes AUTO_BED_LEVELING_GRID
+// END yes AUTO BED LEVELING GRID
+
 
-// no AUTO_BED_LEVELING_GRID
+// START no AUTO BED LEVELING GRID
 // Arbitrary points to probe. A simple cross-product
 // is used to estimate the plane of the bed.
 #define ABL_PROBE_PT_1_X 15
@@ -307,7 +299,7 @@
 #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
+// END no AUTO BED LEVELING GRID
 
 // Offsets to the probe relative to the extruder tip (Hotend - Probe)
 // X and Y offsets MUST be INTEGERS
@@ -321,10 +313,13 @@
 //    |  P (-)    | T <-- probe (-10,-10)
 //    |           |
 //    O-- FRONT --+
+//  (0,0)
 #define X_PROBE_OFFSET_FROM_EXTRUDER  0     // X offset: -left  [of the nozzle] +right
 #define Y_PROBE_OFFSET_FROM_EXTRUDER  0     // Y offset: -front [of the nozzle] +behind
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -1     // Z offset: -below [of the nozzle] (always negative!)
 
+#define XY_TRAVEL_SPEED 10000               // X and Y axis travel speed between probes, in mm/min
+
 #define Z_RAISE_BEFORE_PROBING       10     //How much the extruder will be raised before travelling to the first probing point.
 #define Z_RAISE_BETWEEN_PROBINGS      5     //How much the extruder will be raised when travelling from between next probing points
 #define Z_RAISE_AFTER_PROBING         5     //How much the extruder will be raised after the last probing point.

MK/Configuration_Core.h

@@ -16,8 +16,8 @@
  * - Disables axis
  * - Travel limits
  * - Axis relative mode
- * - MBL or ABL
- * - Auto bed levelling
+ * - Mesh Bed Leveling (MBL)
+ * - Auto Bed Leveling (ABL)
  * - Z probe endstop
  * - Safe Z homing
  * - Manual home positions
@@ -28,6 +28,7 @@
  * - Hotend offset
  *
  * Basic-settings can be found in Configuration_Basic.h
+ * Temperature-settings can be found in Configuration_Temperature.h
  * Feature-settings can be found in Configuration_Feature.h
  * Pins-settings can be found in "Configuration_Pins.h"
  */
@@ -251,24 +252,7 @@
 
 
 /*****************************************************************************************
- ************************************** MBL or ABL ***************************************
- *****************************************************************************************
- *                                                                                       *
- * Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings                         *
- * Set the rectangle in which to probe in MBL or ABL.                                    *
- *                                                                                       *
- *****************************************************************************************/
-#define LEFT_PROBE_BED_POSITION 20
-#define RIGHT_PROBE_BED_POSITION 180
-#define FRONT_PROBE_BED_POSITION 20
-#define BACK_PROBE_BED_POSITION 180
-
-#define XY_TRAVEL_SPEED 10000     // X and Y axis travel speed between probes, in mm/min
-/*****************************************************************************************/
-
-
-/*****************************************************************************************
- ******************************* Mesh bed leveling ***************************************
+ ******************************* Mesh Bed Leveling ***************************************
  *****************************************************************************************/
 //#define MESH_BED_LEVELING
 
@@ -288,7 +272,7 @@
 
 
 /*****************************************************************************************
- ******************************* Auto bed leveling ***************************************
+ ******************************* Auto Bed Leveling ***************************************
  *****************************************************************************************
  *                                                                                       *
  * There are 2 different ways to specify probing locations                               *
@@ -303,7 +287,7 @@
  *   You specify the XY coordinates of all 3 points.                                     *
  *                                                                                       *
  *                                                                                       *
- * Uncomment AUTO_BED_LEVELING_FEATURE to enable                                         *
+ * Uncomment AUTO BED LEVELING FEATURE to enable                                         *
  *                                                                                       *
  *****************************************************************************************/
 //#define AUTO_BED_LEVELING_FEATURE
@@ -313,14 +297,22 @@
 // Note: this feature generates 10KB extra code size
 #define AUTO_BED_LEVELING_GRID
 
-// yes AUTO_BED_LEVELING_GRID
-#define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
+// START yes AUTO BED LEVELING GRID
+#define LEFT_PROBE_BED_POSITION 20
+#define RIGHT_PROBE_BED_POSITION 180
+#define FRONT_PROBE_BED_POSITION 20
+#define BACK_PROBE_BED_POSITION 180
+
+// The probe square sides can be no smaller than this
+#define MIN_PROBE_EDGE 10
+
 // Set the number of grid points per dimension
 // You probably don't need more than 3 (squared=9)
 #define AUTO_BED_LEVELING_GRID_POINTS 2
-// yes AUTO_BED_LEVELING_GRID
+// END yes AUTO BED LEVELING GRID
+
 
-// no AUTO_BED_LEVELING_GRID
+// START no AUTO BED LEVELING GRID
 // Arbitrary points to probe. A simple cross-product
 // is used to estimate the plane of the bed.
 #define ABL_PROBE_PT_1_X 15
@@ -329,7 +321,7 @@
 #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
+// END no AUTO BED LEVELING GRID
 
 // Offsets to the probe relative to the extruder tip (Hotend - Probe)
 // X and Y offsets MUST be INTEGERS
@@ -343,10 +335,13 @@
 //    |  P (-)    | T <-- probe (-10,-10)
 //    |           |
 //    O-- FRONT --+
+//  (0,0)
 #define X_PROBE_OFFSET_FROM_EXTRUDER  0     // X offset: -left  [of the nozzle] +right
 #define Y_PROBE_OFFSET_FROM_EXTRUDER  0     // Y offset: -front [of the nozzle] +behind
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -1     // Z offset: -below [of the nozzle] (always negative!)
 
+#define XY_TRAVEL_SPEED 10000               // X and Y axis travel speed between probes, in mm/min
+
 #define Z_RAISE_BEFORE_PROBING       10     //How much the extruder will be raised before travelling to the first probing point.
 #define Z_RAISE_BETWEEN_PROBINGS      5     //How much the extruder will be raised when travelling from between next probing points
 #define Z_RAISE_AFTER_PROBING         5     //How much the extruder will be raised after the last probing point.

MK/Configuration_Scara.h

@@ -9,6 +9,7 @@
  * - Endstop pullup resistors
  * - Endstops logic
  * - Endstops min or max
+ * - Min Z height for homing
  * - Stepper enable logic
  * - Stepper step logic
  * - Stepper direction
@@ -24,6 +25,7 @@
  * - Hotend offset
  *
  * Basic-settings can be found in Configuration_Basic.h
+ * Temperature-settings can be found in Configuration_Temperature.h
  * Feature-settings can be found in Configuration_Feature.h
  * Pins-settings can be found in "Configuration_Pins.h"
  */
@@ -124,6 +126,18 @@
 /*****************************************************************************************/
 
 
+/*****************************************************************************************
+ ***************************** MIN Z HEIGHT FOR HOMING **********************************
+ *****************************************************************************************
+ *                                                                                       *
+ * (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps,   *
+ * Be sure you have this distance over your Z_MAX_POS in case.                           *
+ *                                                                                       *
+ *****************************************************************************************/
+#define MIN_Z_HEIGHT_FOR_HOMING   0
+/*****************************************************************************************/
+
+
 /*****************************************************************************************
  ********************************* Stepper enable logic **********************************
  *****************************************************************************************

MK/module/digipot/digipot_mcp4451.cpp

+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #include "../../base.h"
 
 #if ENABLED(DIGIPOT_I2C)

MK/module/digipot/digipot_mcp4451.h

+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef DIGIPOT_MCP4451_H
 #define DIGIPOT_MCP4451_H
 

MK/module/sanitycheck.h

@@ -588,9 +588,6 @@
     #if DISABLED(Z_PROBE_OFFSET_FROM_EXTRUDER)
       #error DEPENDENCY ERROR: Missing setting Z_PROBE_OFFSET_FROM_EXTRUDER
     #endif
-    #if DISABLED(Z_RAISE_BEFORE_HOMING)
-      #error DEPENDENCY ERROR: Missing setting Z_RAISE_BEFORE_HOMING
-    #endif
     #if DISABLED(Z_RAISE_BEFORE_PROBING)
       #error DEPENDENCY ERROR: Missing setting Z_RAISE_BEFORE_PROBING
     #endif