Marlin Z-probing in CNC mode (no replies)

Hi,

I recently converted my CNC/3d Printer/Laser Engaver machine from repetier to Marlin 2.x Firmware.
The thing I cannot get to work is Z probing in CNC mode.

I home to Z-Max to prevent colliding with my workpiece.
After this, in repetier I could just move the router bit a few cm above the touchplate and give a G30 command. This gives me the height of the routerbit in respect to the touch plate, From this you can calculate the current Z-height and set this via a G92 command in order to have Z0 on the top of my workpiece. This works at any Z-height (Z_MAX_POS downto Z_MIN_POS)

In Marlin Z-probing only gives me a result when the machine touches the plate around the pre-confugured Z_MIN_POS heigth. If the probe touches the plate at a heigher Z-value it gives me a probing failed message.

Some question:
- Is there way to overcome this problem with some configuration setting?
- Is there a command to automatically set the Z-height (Z0) based on Z-probing, so without a separate G92 command?

Alternative is to code this myself in the marlin firmware.