Well, i started to look at your mod's, and i see that we are taking 2 totally different approaches. If what you have is currently working, but, you mainly want to keep the mapping from getting disabled, it is being disabled in the G28 processing, try bypassing line 3743 in Marlin_main with you ck for the Milling define. That should keep the mapping from getting disabled.
I also think the mods i made should work for you as well, if you don't need or use G30 it will still work.
BUT, i set my code to enable this only using Bilinear ABL, the bypass in G28 should work with any ABL process.
Your using a -15.7mm Probe Z offset, which I assume is the offset using an installed bit, but, won't that change when you change out your bit? So, you would have to know what that offset is of the changed bit??? and change it, right?
Unless you are mounting the switch bracket directly to the bit? and the sw is set at 15.7mm below the tip of the bit, no matter what length of the bit is?
But, if you wind up needing to remeasure and reset the Z Probe offset after you change out a bit, then you should consider adding wiring for a touch-plate and use the G30 command. It uses the same Z-min inputs, i have the touch-plate wires and the Z probe limit sw wires in parallel, they both trigger the same Z-min input.
I just realized as i am writing this, i should probably change my G30 code.... What i am having the G30 code do is find the Z Probe offset, and instead of just setting that value to the Z Probe Offset variable, i am going in and applying the offset directly to the mapped data points. I mean, it works, but, it is is kinda dumb since there is a Z Probe Offset variable, i think all i need to do is set the difference to that variable. Whatever, it is a minor change.
But, if you don't need to remeasure and reset the Z Probe offset, and just keeping the map data enabled is really all you need, take a look at the code i have in the G28 processing part.
I also think the mods i made should work for you as well, if you don't need or use G30 it will still work.
BUT, i set my code to enable this only using Bilinear ABL, the bypass in G28 should work with any ABL process.
Your using a -15.7mm Probe Z offset, which I assume is the offset using an installed bit, but, won't that change when you change out your bit? So, you would have to know what that offset is of the changed bit??? and change it, right?
Unless you are mounting the switch bracket directly to the bit? and the sw is set at 15.7mm below the tip of the bit, no matter what length of the bit is?
But, if you wind up needing to remeasure and reset the Z Probe offset after you change out a bit, then you should consider adding wiring for a touch-plate and use the G30 command. It uses the same Z-min inputs, i have the touch-plate wires and the Z probe limit sw wires in parallel, they both trigger the same Z-min input.
I just realized as i am writing this, i should probably change my G30 code.... What i am having the G30 code do is find the Z Probe offset, and instead of just setting that value to the Z Probe Offset variable, i am going in and applying the offset directly to the mapped data points. I mean, it works, but, it is is kinda dumb since there is a Z Probe Offset variable, i think all i need to do is set the difference to that variable. Whatever, it is a minor change.
But, if you don't need to remeasure and reset the Z Probe offset, and just keeping the map data enabled is really all you need, take a look at the code i have in the G28 processing part.