Merge branch '2.9'

LinuxCNC · Nov 27, 2023 · f4e3b1d · f4e3b1d
2 parents 667249d + 019db91
commit f4e3b1d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/lib/python/qtvcp/widgets/probe_subprog.py b/lib/python/qtvcp/widgets/probe_subprog.py
@@ -242,12 +242,18 @@ def collect_status(self):
 
     # need to be in the right mode - entries are in machine units
     def prechecks(self):
+        # This is a work around. If a user sets the spindle running in MDI
+        # but turn it off with a manual button, then when M72 will turn the
+        # spindle back on! So we explicitly set M5 here.
+        ACTION.CALL_MDI('M5')
+        # record current G,S,M codes
         ACTION.CALL_MDI('M70')
+
+        # set proper mode based on what machine is based
         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
         if INFO.MACHINE_IS_METRIC:
             ACTION.CALL_MDI('g21')
         else:

diff --git a/share/qtvcp/screens/qtdragon/qtdragon_handler.py b/share/qtvcp/screens/qtdragon/qtdragon_handler.py
@@ -56,7 +56,7 @@
 WARNING = 1
 CRITICAL = 2
 
-VERSION ='1.0'
+VERSION ='1.1'
 
 class HandlerClass:
     def __init__(self, halcomp, widgets, paths):

diff --git a/share/qtvcp/screens/qtdragon/version.txt b/share/qtvcp/screens/qtdragon/version.txt
@@ -0,0 +1,5 @@
+Qtdragon
+
+version 1.0 released in linuxcnc 2.9.1
+
+version 1.1 fix probe routines: spindle starts on error or abort
diff --git a/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py b/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py
@@ -59,7 +59,7 @@
 WARNING = 1
 CRITICAL = 2
 
-VERSION ='1.0'
+VERSION ='1.1'
 
 class HandlerClass:
     def __init__(self, halcomp, widgets, paths):

diff --git a/share/qtvcp/screens/qtdragon_hd/version.txt b/share/qtvcp/screens/qtdragon_hd/version.txt
@@ -0,0 +1,5 @@
+Qtdragon_hd
+
+version 1.0 released in linuxcnc 2.9.1
+
+version 1.1 fix probe routines: spindle starts on error or abort