Merge branch '2.9'

Author: c-morley

docs/src/gui/qtdragon.adoc

@@ -495,7 +495,6 @@ These bit/s32/float pins are related to external offsets if they are used:
 [source,{hal}]
 ----
 qtdragon.eoffset-clear
-qtdragon.eoffset-count
 qtdragon.eoffset-enable
 qtdragon.eoffset-value
 qtdragon.eoffset-spindle-count

lib/python/qtvcp/widgets/probe_subprog.py

@@ -164,13 +164,16 @@ def process_command(self, cmd):
         cmd = cmd.rstrip().split('$')
         if cmd[0] in dir(self):
             if not STATUS.is_on_and_idle(): return None
+            pre = self.prechecks()
+            if pre is not None: return pre
             parms = json.loads(cmd[1])
             self.update_data(parms)
             # start polling errors here - parent program should have blocked their polling
             STATUS.unblock_error_polling()
             error = self[cmd[0]]()
             if (error != 1 or type(error)== str) and STATUS.is_on_and_idle():
                 ACTION.CALL_MDI("G90")
+            self.postreset()
             return error
         else:
             return None
@@ -211,6 +214,24 @@ def collect_status(self):
         #    self.send_dict.update( {key: data} )
         #return
 
+    # need to be in the right mode - entries are in machine units
+    def prechecks(self):
+        if INFO.MACHINE_IS_METRIC and STATUS.is_metric_mode():
+            return None
+        if not INFO.MACHINE_IS_METRIC and not STATUS.is_metric_mode():
+            return None
+        # record motion modes
+        ACTION.CALL_MDI('M70')
+        if INFO.MACHINE_IS_METRIC:
+            ACTION.CALL_MDI('g21')
+        else:
+            ACTION.CALL_MDI('g20')
+        return None
+
+    # return to previous motion modes
+    def postreset(self):
+        ACTION.CALL_MDI('M72')
+
 ########################################
 # required boiler code
 ########################################