Avoid Z axis homing when laser has no focus

Documentation/Laser/K40_ramps_configs/Configuration_Laser.h

@@ -17,6 +17,10 @@
 // Uncomment the following if your laser firing pin (not the PWM pin) for two pin control requires a HIGH signal to fire rather than a low (eg Red Sail M300 RS 3040)
 /// #define HIGH_TO_FIRE
 
+// If your machine has laser focuser, set this to true and it will use Z axis for focus or disable it.
+#define LASER_HAS_FOCUS false
+
+
 /// The following define to use the new HakanBasted laser_pulse method to fire laser. It should be more efficient, but it's less tested.
 // Thanks for it to HakanBastedt that has implemented it for Marlin at https://github.com/HakanBastedt/Marlin
 // Uncomment to enable it *USE AT YOUR OWN RISK*, it should work but it's *NOT WELL TESTED YET*

MK/Configuration_Laser.h

@@ -19,6 +19,9 @@
 // Uncomment to enable it *USE AT YOUR OWN RISK*, it should work but it's *NOT WELL TESTED YET*
 //#define LASER_PULSE_METHOD
 
+// If your machine has laser focuser, set this to true and it will use Z axis for focus or disable it.
+#define LASER_HAS_FOCUS false
+
 //// In the case that the laserdriver need at least a certain level "LASER_REMAP_INTENSITY"
 // to give anything, the intensity can be remapped to start at "LASER_REMAP_INTENSITY"
 // At least some CO2-drivers need it, not sure about laserdiode drivers.

MK/module/MK_Main.cpp

@@ -1667,6 +1667,10 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
       #endif
       home_dir(axis);
 
+      #if ENABLED(LASER) && (LASER_HAS_FOCUS == false)
+        if (axis == Z_AXIS) goto AvoidLaserFocus;
+      #endif
+
       // Set the axis position as setup for the move
       current_position[axis] = 0;
 
@@ -1792,6 +1796,9 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
         #endif
       }
     }
+#if ENABLED(LASER) && (LASER_HAS_FOCUS == false)
+AvoidLaserFocus:
+#endif
     if (DEBUGGING(INFO)) {
       ECHO_SMV(INFO, "<<< homeaxis(", (unsigned long)axis);
       ECHO_EM(")");
@@ -8695,24 +8702,28 @@ void clamp_to_software_endstops(float target[3]) {
   if (SOFTWARE_MIN_ENDSTOPS && software_endstops) {
     NOLESS(target[X_AXIS], sw_endstop_min[X_AXIS]);
     NOLESS(target[Y_AXIS], sw_endstop_min[Y_AXIS]);
-    
-    float negative_z_offset = 0;
-    #if ENABLED(AUTO_BED_LEVELING_FEATURE)
-      if (zprobe_zoffset < 0) negative_z_offset += zprobe_zoffset;
-      if (home_offset[Z_AXIS] < 0) {
-        if (DEBUGGING(INFO))
-          ECHO_LMV(INFO, "> clamp_to_software_endstops > Add home_offset[Z_AXIS]:", home_offset[Z_AXIS]);
-        negative_z_offset += home_offset[Z_AXIS];
-      }
+    #if !ENABLED(LASER)
+      float negative_z_offset = 0;
+      #if ENABLED(AUTO_BED_LEVELING_FEATURE)
+        if (zprobe_zoffset < 0) negative_z_offset += zprobe_zoffset;
+        if (home_offset[Z_AXIS] < 0) {
+          if (DEBUGGING(INFO))
+            ECHO_LMV(INFO, "> clamp_to_software_endstops > Add home_offset[Z_AXIS]:", home_offset[Z_AXIS]);
+          negative_z_offset += home_offset[Z_AXIS];
+        }
+      #endif
+      NOLESS(target[Z_AXIS], sw_endstop_min[Z_AXIS] + negative_z_offset);
     #endif
-    NOLESS(target[Z_AXIS], sw_endstop_min[Z_AXIS] + negative_z_offset);
   }
 
   if (SOFTWARE_MAX_ENDSTOPS && software_endstops) {
     NOMORE(target[X_AXIS], sw_endstop_max[X_AXIS]);
     NOMORE(target[Y_AXIS], sw_endstop_max[Y_AXIS]);
-    NOMORE(target[Z_AXIS], sw_endstop_max[Z_AXIS]);
+    #if !ENABLED(LASER)
+      NOMORE(target[Z_AXIS], sw_endstop_max[Z_AXIS]);
+    #endif
   }
+
 }
 
 /**

MK/module/language/language.h

@@ -231,6 +231,8 @@
 #define SERIAL_BED_LEVELLING_Y                  " Y: "
 #define SERIAL_BED_LEVELLING_Z                  " Z: "
 
+#define MSG_COOLER                              "Cooler"
+
 // LCD Menu Messages
 
 #define LANGUAGE_INCL_(M) STRINGIFY_(language_##M.h)

MK/module/lcd/ultralcd.cpp

@@ -767,7 +767,7 @@ MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999);
 // Laser:
 //
 #if ENABLED(LASER) && ENABLED(COOLER)
- MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature_cooler, 0, COOLER_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_COOLER, &target_temperature_cooler, 0, COOLER_MAXTEMP - 15);
 #endif
 
   //

MK/module/motion/planner.cpp

@@ -900,8 +900,7 @@ float junction_deviation = 0.1;
        if (laser.mode == RASTER) {
          for (int i = 0; i < LASER_MAX_RASTER_LINE; i++) {
            #if (!ENABLED(LASER_PULSE_METHOD))
-             float OldRange, NewRange;
-             float NewValue;
+             float OldRange, NewRange, NewValue;
              OldRange = (255.0 - 0.0);
              NewRange = (laser.rasterlaserpower - LASER_REMAP_INTENSITY); 
              NewValue = (float)(((((float)laser.raster_data[i] - 0) * NewRange) / OldRange) + LASER_REMAP_INTENSITY);

MK/module/motion/planner.h

@@ -105,7 +105,7 @@ typedef struct {
     float laser_ppm; // pulses per millimeter, for pulsed and raster firing modes
     unsigned long laser_duration; // laser firing duration in microseconds, for pulsed and raster firing modes
     long steps_l; // step count between firings of the laser, for pulsed firing mode
-    int laser_intensity; // Laser firing instensity in clock cycles for the PWM timer
+    float laser_intensity; // Laser firing instensity in clock cycles for the PWM timer
     #if ENABLED(LASER_RASTER)
       unsigned char laser_raster_data[LASER_MAX_RASTER_LINE];
       float laser_raster_intensity_factor;

MK/module/sanitycheck.h

@@ -1847,6 +1847,10 @@
     #endif
   #endif
 
+  #if DISABLED(LASER_HAS_FOCUS)
+    #error DEPENDENCY ERROR: Missing LASER_HAS_FOCUS setting
+  #endif
+
   #if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXISTS(FILRUNOUT)
     #error DEPENDENCY ERROR: You have to set FILRUNOUT_PIN to a valid pin if you enable FILAMENT_RUNOUT_SENSOR
   #endif