Merge branch '2.9'

# Conflicts:
#	VERSION
#	debian/changelog
#	src/emc/usr_intf/gmoccapy/gmoccapy.py

Author: andypugh

debian/changelog

@@ -3,15 +3,14 @@ linuxcnc (1:2.10.0~pre0) UNRELEASED; urgency=medium
   [ Andy Pugh ]
   * Master branch open for new features.
 
-  [ Pushkar Kulkarni ]
-  * debian/patches: Remove the use of FORTIFY_SOURCE and
-    depend on defaults passed by dpkg-buildflags on
-    Ubuntu and Debian (LP: #2104012)
+linuxcnc (1:2.9.6) UNRELEASED; urgency=medium
 
-  [ Steffen Moeller ]
-  * Introducing DEB_BUILD_OPTIONS to d/rules.
+  * qtvcp -Qt5_graphics: issue 2753; preview wrongly uses INI startup code
+  * Merge pull request #3567 from Sigma1912/2_9-Correct_bad_fix_for_2753
+  * Gremlin: Don't use  RS274NGC_STARTUP_CODE when updating the preview
+  * Docs: Address G52 Circular Link #3565
 
- -- Pushkar Kulkarni <[email protected]>  Mon, 24 Mar 2025 20:50:08 +0530
+ -- andypugh <[email protected]>  Mon, 22 Sep 2025 22:55:20 +0100
 
 linuxcnc (1:2.9.5) UNRELEASED; urgency=medium
 

docs/src/gcode/g-code.adoc

@@ -87,7 +87,7 @@ as the 'L number', and so on for any other letter.
 |<<gcode:g43.1,G43.1>>             |Dynamic Tool Length Offset
 |<<gcode:g43.2,G43.2>>             |Apply additional Tool Length Offset
 |<<gcode:g49,G49>>                 |Cancel Tool Length Offset
-|<<gcode:,>>                 |Local Coordinate System Offset
+|<<gcode:g52,G52>>                 |Local Coordinate System Offset
 |<<gcode:g53,G53>>                 |Move in Machine Coordinates
 |<<gcode:g54-g59.3,G54-G59.3>>     |Select Coordinate System (1 - 9)
 |<<gcode:g61,G61>>                 |Exact Path Mode
@@ -800,9 +800,9 @@ Important Concepts:
   system.
 * When a rotation is in effect jogging an axis will only move that axis
   in a positive or negative direction and not along the rotated axis.
-* If a '' local offset or 'G92' origin offset was in effect before
+* If a 'G52' local offset or 'G92' origin offset was in effect before
   'G10 L2', it will continue to be in effect afterwards.
-* When programming a coordinate system with R, any '' or 'G92' will
+* When programming a coordinate system with R, any 'G52' or 'G92' will
   be applied *after* the rotation.
 * The coordinate system whose origin is set by a 'G10' command may be
   active or inactive at the time the 'G10' is executed.
@@ -852,7 +852,7 @@ G10 L10 P- axes <R- I- J- Q->
 
 G10 L10 changes the tool table entry for tool P so that if the tool
 offset is reloaded, with the machine in its current position and with
-the current G5x and /G92 offsets active, the current coordinates for
+the current G5x and G52/G92 offsets active, the current coordinates for
 the given axes will become the given values. The axes that are not
 specified in the G10 L10 command will not be changed. This could be
 useful with a probe move as described in the <<gcode:g38,G38>> section.
@@ -894,7 +894,7 @@ G10 L11 is just like G10 L10 except that instead of setting the entry
 according to the current offsets, it is set so that the current
 coordinates would become the given value if the new tool offset
 is reloaded and the machine is placed in the G59.3 coordinate
-system without any /G92 offset active.
+system without any G52/G92 offset active.
 
 This allows the user to set the G59.3 coordinate system according to a
 fixed point on the machine, and then use that fixture to measure tools
@@ -1535,9 +1535,8 @@ G52 axes
 
 G52 is used in a part program as a temporary "local coordinate system
 offset" within the workpiece coordinate system. For more information about
-`G92` and `G52` and how they interact see the 
-<<sec:g52-and-g92-offsets,Local and Global Offsets>>
-section.
+`G92` and `G52` and how they interact see
+<<sec:g52-and-g92-offsets,Local and Global Offsets.>>
 
 [[gcode:g53]]
 == G53 Move in Machine Coordinates(((G53 Machine Coordinates)))

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -1948,6 +1948,9 @@ def _init_tooleditor(self):
         self.widgets.tooledit1.set_visible("abcxyzuvwijq", False)
         for axis in self.axis_list:
             self.widgets.tooledit1.set_visible("{0}".format(axis), True)
+        # disconnect the key_press handler in the widget
+        tv = self.widgets.tooledit1.wTree.get_object("treeview1")
+        tv.disconnect_by_func(self.widgets.tooledit1.on_tree_navigate_key_press)
         # if it's a lathe config we show lathe related columns
         if self.lathe_mode:
             self.widgets.tooledit1.set_visible("ijq", True)

src/emc/usr_intf/halui.cc

@@ -873,7 +873,6 @@ int halui_hal_init(void)
     }
 
     for (axis_num = 0; axis_num < EMCMOT_MAX_AXIS; axis_num++) {
-        if ( !(axis_mask & (1 << axis_num)) ) { continue; }
         char c = "xyzabcuvw"[axis_num];
         retval =  hal_pin_bit_newf(HAL_IN, &(halui_data->axis_nr_select[axis_num]), comp_id, "halui.axis.%c.select", c);
         if (retval < 0) return retval;