Probe screen V2 with Gmoccapy T/M6 causes system to pause - Solved+Corrections

The probeheight and blockheight(both are pins setup by the gladevcp panel) are measured relative to machine zero using other macros. Instructions say to measure the tool setter(probeheight) height first then the workpiece height(blockheight). Incidentally, measuring either one using the provided macros also sets your Z zero point of the current WCS to that height (i.e. your WCS Z zero becomes the top of the workpiece if you follow the provided instructions, also not sure why you'd do that)

-Continuing with the provided  instructions, a T*** M6 in the g-code would trigger the system to measure the currently loaded tool against the tool setter. Based on the code above, the current tool offset would be updated to be  difference between the original reference probe/tool and the currently loaded/measured tool + the height of your workpiece!! This is obviously wrong.

-There is a commented line in the same macro file that would set  the currently selected work coordinate system(P0) Z to your original workpiece Z height + the difference between reference and current tool. This could work provided your WCS Z is always set to be the top of the workpiece..fair assumption for mills with a vice I guess??  I think is the more elegant solution would be to just set the offset of the current tool as follows: