Merge branch '2.9'

Author: hansu

configs/sim/gmoccapy/dro.glade

@@ -23,6 +23,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <property name="joint-number">1</property>
             <attributes>
               <attribute name="style" value="normal"/>
@@ -43,6 +44,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <attributes>
               <attribute name="style" value="normal"/>
               <attribute name="weight" value="bold"/>
@@ -62,6 +64,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <property name="joint-number">1</property>
             <property name="reference-type">2</property>
             <attributes>
@@ -83,6 +86,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <property name="reference-type">2</property>
             <attributes>
               <attribute name="style" value="normal"/>
@@ -103,6 +107,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <property name="joint-number">1</property>
             <property name="reference-type">1</property>
             <attributes>
@@ -124,6 +129,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <property name="reference-type">1</property>
             <attributes>
               <attribute name="style" value="normal"/>
@@ -144,6 +150,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <property name="joint-number">2</property>
             <attributes>
               <attribute name="style" value="normal"/>
@@ -164,6 +171,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <property name="joint-number">2</property>
             <property name="reference-type">1</property>
             <attributes>
@@ -185,6 +193,7 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">label</property>
             <property name="display-units-mm">True</property>
+            <property name="font-size">22</property>
             <property name="joint-number">2</property>
             <property name="reference-type">2</property>
             <attributes>

debian/changelog

@@ -4,6 +4,23 @@ linuxcnc (1:2.10.0~pre0) UNRELEASED; urgency=medium
   * Master branch open for new features.
 
  -- andypugh <andy@bodgesoc.org>  Mon, 22 Sep 2025 22:55:20 +0100
+ 
+linuxcnc (1:2.9.8) UNRELEASED; urgency=medium
+
+  * backport #3516 to fix #3679
+  * Only initialize python if not yet initialized.
+  * hal_gpio: Adapt to use libgpiod3 or libgpiod2 according to what is installed
+  * Merge pull request #3671 from smoe/docs_image_handling
+  * core-components.adoc remove duplicate descriptions
+  * Merge pull request #3642 from LinuxCNC/2.9_#2460
+  * Update LinuxCNC RTAI Install instructions
+  * Merge pull request #3555 from smoe/lintian_warnings
+  * Merge pull request #3588 from f355/2.9
+  * [ci] publish releases with artifacts
+  * debian: Addressed lintian warnings
+  * axis.py: restore mdi queuing provision       #2460 
+
+ -- andypugh <andy@bodgesoc.org>  Wed, 31 Dec 2025 19:39:48 +0000
 
 linuxcnc (1:2.9.7) bookworm; urgency=low
 

docs/src/getting-started/about-linuxcnc.adoc

@@ -6,21 +6,20 @@
 
 == The Software
 
-(((About LinuxCNC)))
 * LinuxCNC (the Enhanced Machine Control) is a software system for computer
   control of machine tools such as milling machines and lathes, robots
   such as puma and scara and other computer controlled machines up to 9 axes.
 * LinuxCNC is free software with open source code. Current versions of LinuxCNC
   are entirely licensed under the GNU General Public License and Lesser
   GNU General Public License (GPL and LGPL).
 * LinuxCNC provides:
-** easy discovery and testing without installation with the LiveCD,
-** easy installation from the Live CD,
+** easy discovery and testing without installation with the Live Image,
+** easy installation from the Live Image,
 ** easy to use graphical configuration wizards to rapidly create a configuration
    specific to the machine,
 ** directly available as regular packages of recent releases of Debian (since Bookworm) and Ubuntu (since Kinetic Kudu),
 ** a graphical user interface (actually several interfaces to choose from),
-** a graphical interface creation tool (Glade),
+** graphical interface creation tools (Glade, Qt),
 ** an interpreter for 'G-code' (the RS-274 machine tool programming
    language),
 ** a realtime motion planning system with look-ahead,
@@ -29,7 +28,9 @@
 ** a software PLC programmable with ladder diagrams.
 * It does not provide drawing (CAD - Computer Aided Design) or G-code generation
   from the drawing (CAM - Computer Automated Manufacturing) functions.
-* It can simultaneously move up to 9 axes and supports a variety of interfaces.
+* It can make coordinated moves with up to 9 axes and up to 16 extra axes
+  can be controlled individually.
+* It supports a variety of hardware interfaces.
 * The control can operate true servos (analog or PWM) with the feedback
   loop closed by the LinuxCNC software at the computer, or open loop with
   step-servos or stepper motors.
@@ -45,12 +46,21 @@
 
 == The Operating System
 
-LinuxCNC is available as ready-to-use packages for the Ubuntu and Debian
+LinuxCNC is available as ready-to-use packages for Debian
 distributions.
 
 [[sec:getting-help]]
 == Getting Help
 
+=== Web Forum
+
+A web forum can be found at https://forum.linuxcnc.org or by following
+the link at the top of the linuxcnc.org home page.
+
+This is quite active but the demographic is more user-biased than the
+mailing list.  If you want to be sure that your message is seen by the
+developers then the mailing list is to be preferred.
+
 === IRC
 
 (((Getting Help)))
@@ -109,11 +119,12 @@ developers then the mailing list is to be preferred.
 A Wiki site is a user maintained web site that anyone can add to or edit.
 
 The user maintained LinuxCNC Wiki site contains a
-wealth of information and tips at http://wiki.linuxcnc.org/.
+wealth of information and tips at:
+link:http://wiki.linuxcnc.org/[http://wiki.linuxcnc.org]
 
 === Bug Reports
 
-Report bugs to the LinuxCNC
+Report bugs on the LinuxCNC Github
 link:https:///github.com/LinuxCNC/linuxcnc/issues[github bug tracker].
 
 // vim: set syntax=asciidoc:

docs/src/getting-started/getting-linuxcnc.adoc

@@ -40,7 +40,7 @@ This section describes some methods for downloading the Live/Install image.
 Software for LinuxCNC to download is presented on the project's
 https://linuxcnc.org/downloads/[Downloads page].
 Most users will aim for the disk image for Intel/AMD PCs, the URL
-will resemble https://www.linuxcnc.org/iso/linuxcnc_2.9.7-amd64.hybrid.iso.
+will resemble https://www.linuxcnc.org/iso/linuxcnc_2.9.8-amd64.hybrid.iso.
 
 For the Raspberry Pi, multiple images are provided to address
 differences between the RPi4 and RPi5.
@@ -68,7 +68,7 @@ sudo apt-get install zsync
 . Then run this command to download the iso to your computer
 +
 ----
-zsync http://www.linuxcnc.org/iso/linuxcnc_2.9.4-amd64.hybrid.iso
+zsync https://www.linuxcnc.org/iso/linuxcnc_2.9.8-amd64.hybrid.iso
 ----
 
 Please remember to confirm the checksum of the downloaded iso
@@ -88,28 +88,28 @@ https://www.assembla.com/spaces/zsync-windows/documents .
 . After downloading, verify the checksum of the image to ensure integrity.
 
 ----
-md5sum linuxcnc-2.9.7-amd64.iso
+md5sum linuxcnc-2.9.8-amd64.iso
 ----
 
 or
 
 ----
-sha256sum linuxcnc-2.9.7-amd64.iso
+sha256sum linuxcnc-2.9.8-amd64.iso
 ----
 . Then compare to these checksums
 
 -----
 amd64 (PC)
-md5sum: 1815aceaac0e7861747aa34d61846e79
-sha256sum: 08b3f59233e47c91cf1c9a85c41df48542c97b134efefa7446d3060c9a3e644b
+md5sum: 71925c8e618b728e255eaf77870960df
+sha256sum: 241e496a97b7a57d2832c35fcacb352e113e38914104476cafd1960ab9d6dc14
 arm64 (Pi)
 md5sum: 4547e8a72433efb033f0a5cf166a5cd2
 sha256sum: ff3ba9b8dfb93baf1e2232746655f8521a606bc0fab91bffc04ba74cc3be6bf0
 -----
 
 .Verify md5sum on Windows or Mac
 
-Windows and Mac OS X do not come with an md5sum program, but there are
+Windows does not come with an md5sum program, but there are
 alternatives.  More information can be found at:
 https://help.ubuntu.com/community/HowToMD5SUM[How To MD5SUM]
 
@@ -121,8 +121,9 @@ used to boot a computer.  The image is too large to fit on a CD.
 
 === Raspberry Pi Image
 
-The Raspberry Pi image is a complete SD card image and should be written
-to an SD card with the https://www.raspberrypi.com/software/[Raspberry Pi Imager App].
+The Raspbery Pi image is a complete SD card image and should be
+written to an SD card with the [Raspberry Pi Imager App](https://www.raspberrypi.com/software/).
+Note that the imager app can open the .zip file directly, no need to expand.
 
 === AMD-64 (x86-64, PC) Image using GUI tools
 
@@ -144,7 +145,7 @@ It looks more complicated but seems to be more compatible with various BIOSes.
   then use this command:
 +
 -----
-dd if=linuxcnc_2.9.7-amd64.hybrid.iso of=/dev/sde bs=4k status=progress
+dd if=linuxcnc_2.9.8-amd64.hybrid.iso of=/dev/sde bs=4k status=progress
 -----
 
 === Command line - MacOS
@@ -164,10 +165,8 @@ diskutil unmountDisk /dev/diskN
   Note that the disk name has an added "r" at the beginning.
 +
 -----
-sudo dd if=linuxcnc_2.9.7-amd64.hybrid.iso of=/dev/rdiskN bs=1m
+sudo dd if=linuxcnc_2.9.8-amd64.hybrid.iso of=/dev/rdiskN bs=1m status=progress
 -----
-. Note that this may take a long time to complete and there will be no
-  feedback during the process.
 
 .Writing the image to a DVD in Linux
 
@@ -256,12 +255,12 @@ In addition, for experienced users who are familiar with Debian system administr
 
 [options="header"]
 |===
+| Debian Trixie   | amd64 & arm64 | preempt-rt | linuxcnc-uspace | machine control & simulation
+| Debian Troxie   | amd64         | RTAI       | linuxcnc        | machine control
 | Distribution    | Architecture  | Kernel     | Package name    | Typical use
 | Debian Bookworm | amd64 & arm64 | preempt-rt | linuxcnc-uspace | machine control & simulation
 | Debian Bookworm | amd64         | RTAI       | linuxcnc        | machine control
 | Debian Bullseye | amd64         | preempt-rt | linuxcnc-uspace | machine control & simulation
-| Debian Buster   | amd64 & arm64 | preempt-rt | linuxcnc-uspace | machine control & simulation
-| Debian Buster   | amd64         | RTAI       | linuxcnc        | machine control
 | Any             | Any           | Stock      | linuxcnc-uspace | simulation ONLY
 |===
 
@@ -279,16 +278,17 @@ Synaptic Package manager or with apt-get at the command-line.
 The RTAI kernels are available for download from the linuxcnc.org debian archive.
 The apt source is:
 
-* Debian Bookworm: `deb https://linuxcnc.org bookworm base`
-* Debian Bullseye: `deb https://linuxcnc.org bullseye base`
-* Debian Buster: `deb https://linuxcnc.org buster base`
+* Debian Trixie: `deb http://linuxcnc.org trixie base`
+* Debian Bookworm: `deb http://linuxcnc.org bookworm base`
+* Debian Bullseye: `deb http://linuxcnc.org bullseye base`
+* Debian Buster: `deb http://linuxcnc.org buster base`
 
 LinuxCNC and the RTAI kernel are now only available for 64-bit OSes but
 there are very few surviving systems that can not run a 64-bit OS.
 
-=== Installing on Debian Bookworm (with Preempt-RT kernel)
+=== Installing on Debian Trixie (with Preempt-RT kernel)
 
-. Install Debian Bookworm (Debian 12), amd64 version.
+. Install Debian Trixie (Debian 13), amd64 version.
   You can download the installer here:
   https://www.debian.org/distrib/
 
@@ -308,8 +308,8 @@ sudo apt-get dist-upgrade
 ----
 +
 NOTE: It is possible to download a version of LinuxCNC directly from Debian
-but this will install an old pre-release version, and is not recommended
-at this time.
+(currently version 2.9.4) but a more up-to-date version (2.9.8) can
+be installed from the LinuxCNC repository. 
 
 . Install the Preempt-RT kernel and modules
 +
@@ -351,11 +351,10 @@ sudo ./linuxcnc-install.sh
 ----
 
 [[cha:Installing-RTAI]]
-
-=== Installing on Debian Bookworm (with experimental RTAI kernel)
+=== Installing on Debian Trixie (with experimental RTAI kernel)
 
 . This kernel and LinuxCNC version can be installed on top of the Live DVD
-  install, or alternatively on a fresh Install of Debian Bookworm 64-bit
+  install, or alternatively on a fresh Install of Debian Trixie 64-bit
   as described above.
 . You can add the LinuxCNC archive signing key and repository information
   by downloading and running the installer script as described above.

docs/src/getting-started/system-requirements.adoc

@@ -26,8 +26,7 @@ the following minimum hardware specification. These numbers are not the
 absolute minimum but will give reasonable performance for most stepper
 systems.
 
-* 700 MHz x86 processor (1.2 GHz x86 processor recommended) or Raspberry Pi 4 or better.
-* LinuxCNC 2.8 or later from the Live CD expects a 64-bit capable system.
+* 1.2 GHz 64-bit x86 processor or Raspberry Pi 4 or better.
 * 512 MB of RAM, 4 GB with GUI to avoid surprises
 * No hard disk for Live CD, 8 GB or more for permanent installation
 * Graphics card capable of at least 1024x768 resolution, which is not using the NVidia or ATI fglrx proprietary drivers.