Fix Z_RAISE_AFTER_PROBING for non DELTA printers

[jbrazio]

Discussed at #3034: Z_RAISE_AFTER_PROBING value was being ignored by Marlin because raise_z_after_probing() was only called if the printer type was set to a DELTA or if the printer had a docking sled for the probe.

[Blue-Marlin]

This would rise twice for servo probes.

[jbrazio]

Is it related with this ?

        current_position[Z_AXIS] = -zprobe_zoffset + (z_tmp - real_z)
          #if HAS_SERVO_ENDSTOPS || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED)
             + Z_RAISE_AFTER_PROBING
          #endif
          ;

[Blue-Marlin]

No. It's done much earlier in probe_pt() when called with probe_action = ProbeStow, stow_z_probe() is called, calling `raise_z_after_probing()'.

[jbrazio]

You're correct. I did pass by it because I was assuming HAS_SERVO_ENDSTOPS was associated with the sled, but by looking at Conditionals.h I now see clearly it's not.

    #if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || Z_ENDSTOP_SERVO_NR >= 0
      #define HAS_SERVO_ENDSTOPS true

So would it suffice to change the patch from:

      // Sled assembly for Cartesian bots
      #if ENABLED(Z_PROBE_SLED)
        dock_sled(true); // dock the sled
      #elif Z_RAISE_AFTER_PROBING > 0
        raise_z_after_probing();
      #endif

To:

      // Sled assembly for Cartesian bots
      #if ENABLED(Z_PROBE_SLED)
        dock_sled(true); // dock the sled
      #elif !defined(HAS_SERVO_ENDSTOPS) && Z_RAISE_AFTER_PROBING > 0
        raise_z_after_probing();
      #endif

Or revert it and do something like:

      // Sled assembly for Cartesian bots
      #if ENABLED(Z_PROBE_SLED)
        dock_sled(true); // dock the sled
      #endif

      // Raise the probe
      #if !defined(HAS_SERVO_ENDSTOPS) && DISABLED(Z_PROBE_ALLEN_KEY) && DISABLED(Z_PROBE_SLED)
        raise_z_after_probing();
      #endif

Edit: Maybe DISABLED(Z_PROBE_ALLEN_KEY) is an overkill because at this point in the code we already know it's not a DELTA.

[jbrazio]

Ended up going with a third option which is a mix between the previous two, first check if the value of Z_RAISE_AFTER_PROBING is non-zero and only then exclude all the combinations where the Z axis could already have been raised i.e. stow_z_probe().

[thinkyhead]

@jbrazio Do you mind making an equivalent patch for dev?

[jbrazio]

No problem, I'll submit a PR to it.

[jbrazio]

@thinkyhead I suggest for you to close #3034

[thinkyhead]

@jbrazio Thanks! Done!