Merge branch 'dev'

Documentation/Laser/K40_ramps_configs/K40_no_cooler_no_flowmeter/Configuration_Cartesian.h

@@ -8,14 +8,15 @@
  * - Endstop pullup resistors
  * - Endstops logic
  * - Endstops min or max
+ * - Min Z height for homing
  * - Stepper enable logic
  * - Stepper step logic
  * - Stepper direction
  * - 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
@@ -27,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"
  */
@@ -104,6 +106,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 **********************************
  *****************************************************************************************
@@ -216,24 +230,27 @@
 
 
 /*****************************************************************************************
- ************************************** MBL or ABL ***************************************
- *****************************************************************************************
- *                                                                                       *
- * Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings                         *
- * Set the rectangle in which to probe in MBL or ABL.                                    *
- *                                                                                       *
+ ******************************* Mesh Bed Leveling ***************************************
  *****************************************************************************************/
-#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 MESH_BED_LEVELING
 
-#define XY_TRAVEL_SPEED 10000     // X and Y axis travel speed between probes, in mm/min
+#define MESH_INSET         10   // Mesh inset margin on print area
+#define MESH_NUM_X_POINTS   3   // Don't use more than 7 points per axis, implementation limited.
+#define MESH_NUM_Y_POINTS   3
+#define MESH_HOME_SEARCH_Z  5   // Z after Home, bed somewhere below but above 0.0.
+
+// After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
+//#define MESH_G28_REST_ORIGIN
+
+// Add display menu option for bed leveling.
+//#define MANUAL_BED_LEVELING
+// Step size while manually probing Z axis.
+#define MBL_Z_STEP 0.025
 /*****************************************************************************************/
 
 
 /*****************************************************************************************
- ******************************* Auto bed levelling **************************************
+ ******************************* Auto Bed Leveling ***************************************
  *****************************************************************************************
  *                                                                                       *
  * There are 2 different ways to specify probing locations                               *
@@ -248,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
@@ -258,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
@@ -274,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
@@ -288,12 +313,12 @@
 //    |  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 Z_RAISE_BEFORE_HOMING        10     // (in mm) Raise Z before homing (G28) for Probe Clearance.
-                                            // Be sure you have this distance over your Z_MAX_POS in case
+#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

Documentation/Laser/K40_ramps_configs/K40_no_cooler_no_flowmeter/Configuration_Feature.h

@@ -23,6 +23,7 @@
  * - Software endstops
  * - Endstops only for homing
  * - Abort on endstop hit feature
+ * - Mesh Level Area
  * - R/C Servo
  * - Late Z axis
  * - Ahead slowdown
@@ -437,6 +438,23 @@
  **************************************************************************/
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
 #define ABORT_ON_ENDSTOP_HIT_INIT true
+/**************************************************************************/
+
+
+/**************************************************************************
+ *************************** Mesh Level Area ******************************
+ **************************************************************************
+ *                                                                        *
+ * Default mesh area is an area with an inset margin on the print area.   *
+ * Below are the macros that are used to define the borders for the mesh  *
+ * area, made available here for specialized needs.                       *
+ *                                                                        *
+ **************************************************************************/
+#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
+#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
+#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
+#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
+/**************************************************************************/
 
 
 /**************************************************************************
@@ -1195,9 +1213,9 @@
  ************************** Motor's current ****************************
  ***********************************************************************/
 // Motor Current setting (Only functional on ALLIGATOR BOARD)
-#define MOTOR_CURRENT {1, 1, 1, 1, 1, 1, 1} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
+#define MOTOR_CURRENT {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
 // Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards)
-#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
+#define DIGIPOT_MOTOR_CURRENT {135, 135, 135, 135, 135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
 /***********************************************************************/
 
 

Documentation/Laser/K40_ramps_configs/K40_no_cooler_no_flowmeter/Configuration_Pins.h

@@ -114,6 +114,7 @@
   #elif LASER_CONTROL == 2
     #define LASER_PWR_PIN 6
     #define LASER_TTL_PIN 5
+  #endif
   #if ENABLED(LASER_PERIPHERALS)
     #define LASER_PERIPHERALS_PIN         11
     #define LASER_PERIPHERALS_STATUS_PIN  14

Documentation/Laser/K40_ramps_configs/K40_with_cooler_and_flowmeter/Configuration_Cartesian.h

@@ -8,14 +8,15 @@
  * - Endstop pullup resistors
  * - Endstops logic
  * - Endstops min or max
+ * - Min Z height for homing
  * - Stepper enable logic
  * - Stepper step logic
  * - Stepper direction
  * - 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
@@ -27,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"
  */
@@ -104,6 +106,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 **********************************
  *****************************************************************************************
@@ -216,24 +230,27 @@
 
 
 /*****************************************************************************************
- ************************************** MBL or ABL ***************************************
- *****************************************************************************************
- *                                                                                       *
- * Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings                         *
- * Set the rectangle in which to probe in MBL or ABL.                                    *
- *                                                                                       *
+ ******************************* Mesh Bed Leveling ***************************************
  *****************************************************************************************/
-#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 MESH_BED_LEVELING
 
-#define XY_TRAVEL_SPEED 10000     // X and Y axis travel speed between probes, in mm/min
+#define MESH_INSET         10   // Mesh inset margin on print area
+#define MESH_NUM_X_POINTS   3   // Don't use more than 7 points per axis, implementation limited.
+#define MESH_NUM_Y_POINTS   3
+#define MESH_HOME_SEARCH_Z  5   // Z after Home, bed somewhere below but above 0.0.
+
+// After homing all axes ('G28' or 'G28 XYZ') rest at origin [0,0,0]
+//#define MESH_G28_REST_ORIGIN
+
+// Add display menu option for bed leveling.
+//#define MANUAL_BED_LEVELING
+// Step size while manually probing Z axis.
+#define MBL_Z_STEP 0.025
 /*****************************************************************************************/
 
 
 /*****************************************************************************************
- ******************************* Auto bed levelling **************************************
+ ******************************* Auto Bed Leveling ***************************************
  *****************************************************************************************
  *                                                                                       *
  * There are 2 different ways to specify probing locations                               *
@@ -248,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
@@ -258,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
@@ -274,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
@@ -288,12 +313,12 @@
 //    |  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 Z_RAISE_BEFORE_HOMING        10     // (in mm) Raise Z before homing (G28) for Probe Clearance.
-                                            // Be sure you have this distance over your Z_MAX_POS in case
+#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

Documentation/Laser/K40_ramps_configs/K40_with_cooler_and_flowmeter/Configuration_Feature.h

@@ -23,6 +23,7 @@
  * - Software endstops
  * - Endstops only for homing
  * - Abort on endstop hit feature
+ * - Mesh Level Area
  * - R/C Servo
  * - Late Z axis
  * - Ahead slowdown
@@ -437,6 +438,23 @@
  **************************************************************************/
 //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
 #define ABORT_ON_ENDSTOP_HIT_INIT true
+/**************************************************************************/
+
+
+/**************************************************************************
+ *************************** Mesh Level Area ******************************
+ **************************************************************************
+ *                                                                        *
+ * Default mesh area is an area with an inset margin on the print area.   *
+ * Below are the macros that are used to define the borders for the mesh  *
+ * area, made available here for specialized needs.                       *
+ *                                                                        *
+ **************************************************************************/
+#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
+#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
+#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
+#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
+/**************************************************************************/
 
 
 /**************************************************************************
@@ -1195,9 +1213,9 @@
  ************************** Motor's current ****************************
  ***********************************************************************/
 // Motor Current setting (Only functional on ALLIGATOR BOARD)
-#define MOTOR_CURRENT {1, 1, 1, 1, 1, 1, 1} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
+#define MOTOR_CURRENT {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
 // Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards)
-#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
+#define DIGIPOT_MOTOR_CURRENT {135, 135, 135, 135, 135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
 /***********************************************************************/
 
 

Documentation/Laser/K40_ramps_configs/K40_with_cooler_and_flowmeter/Configuration_Pins.h

@@ -114,6 +114,7 @@
   #elif LASER_CONTROL == 2
     #define LASER_PWR_PIN 6
     #define LASER_TTL_PIN 5
+  #endif
   #if ENABLED(LASER_PERIPHERALS)
     #define LASER_PERIPHERALS_PIN         11
     #define LASER_PERIPHERALS_STATUS_PIN  14