Merge branch 'master' into k40_noflow_nocooler

MK/Configuration_Store.cpp

@@ -35,6 +35,7 @@
  *       either sets a Sane Default, or results in No Change to the existing value.
  *
  */
+
 #include "base.h"
 
 #define EEPROM_VERSION "MKV429"

MK/MK.ino

@@ -35,7 +35,7 @@
  * "G" Codes
  *
  * G0  -> G1 except for laser where G0 is "move without firing"
- * G1  - Coordinated Movement X Y Z E, for laser move by firing
+ * G1  - Coordinated Movement X Y Z E F(feedrate) P(Purge), for laser move by firing
  * G2  - CW ARC
  * G3  - CCW ARC
  * G4  - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond
@@ -209,6 +209,7 @@
  */
 
 #include "base.h"
+
 #if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
   #include <Wire.h>
 #endif

MK/module/MK_Main.cpp

@@ -1870,6 +1870,8 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
     delta_tower3_y = (delta_radius + tower_adj[5]) * sin((90 + tower_adj[2]) * M_PI/180); 
   }
 
+  #if ENABLED(Z_PROBE_ENDSTOP)
+
     bool Equal_AB(const float A, const float B, const float prec = ac_prec) {
       if (abs(A - B) <= prec) return true;
       return false;
@@ -1920,16 +1922,6 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
       }
     }
 
-  // Reset calibration results to zero.
-  static void reset_bed_level() {
-    if (DEBUGGING(INFO)) ECHO_LM(INFO, "reset_bed_level");
-    for (int y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) {
-      for (int x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) {
-        bed_level[x][y] = 0.0;
-      }
-    }
-  }
-
     static void deploy_z_probe() {
 
       if (DEBUGGING(INFO)) DEBUG_POS("deploy_z_probe", current_position);
@@ -2638,6 +2630,18 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
       ECHO_E;
     }
 
+  #endif
+
+  // Reset calibration results to zero.
+  static void reset_bed_level() {
+    if (DEBUGGING(INFO)) ECHO_LM(INFO, "reset_bed_level");
+    for (int y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) {
+      for (int x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) {
+        bed_level[x][y] = 0.0;
+      }
+    }
+  }
+
   static void home_delta_axis() {
 
     set_destination_to_current();
@@ -5626,6 +5630,7 @@ inline void gcode_M81() {
       laser_peripherals_off();
     #endif
   #endif
+
   delay_ms(1000); // Wait 1 second before switching off
 
   #if HAS(SUICIDE)