Merge branch '2.9' into HEAD

Author: andypugh

configs/apps/xhc-hb04/README

@@ -1,5 +1,6 @@
 xhc-hbo4 standalone tests
 
+Imortant Note: This only works with 'XTerm'
 
 Use to test button layouts for a USB wireless xhc-hb04 pendant.
 

debian/control.main-pkg.in

@@ -22,7 +22,7 @@ Depends:
     python3-opengl,
     python3-configobj,
     python3-xlib,
-    libgtksourceview-3.0-dev,
+    libgtksourceview-4-dev,
     tcl@TCLTK_VERSION@,
     tk@TCLTK_VERSION@,
     bwidget (>= 1.7),

debian/linuxcnc.install.in

@@ -115,7 +115,7 @@ usr/share/axis
 usr/share/glade
 usr/share/gmoccapy
 usr/share/gscreen
-usr/share/gtksourceview-2.0
+usr/share/gtksourceview-4
 
 usr/share/applications/linuxcnc.desktop
 usr/share/applications/linuxcnc-latency.desktop

docs/src/config/ini-config.adoc

@@ -318,7 +318,7 @@ See <<cha:gmoccapy,GMOCCAPY>> document for GMOCCAPY details.
   The INCREMENTS can be used to override the default.
   The values can be decimal numbers (e.g., 0.1000) or fractional numbers (e.g., 1/16), optionally followed by a unit (cm, mm, um, inch, in or mil).
   If a unit is not specified the machine unit is assumed.
-  Metric and imperial distances may be mixed: INCREMENTS = 1 inch, 1 mil, 1 cm, 1 mm, 1 µm is a valid entry.
+  Metric and imperial distances may be mixed: INCREMENTS = 1 inch, 1 mil, 1 cm, 1 mm, 1 um is a valid entry.
 * `GRIDS = 10 mm, 1 in, ...` - Defines the preset values for grid lines.
   The value is interpreted the same way as `INCREMENTS`.
 * `OPEN_FILE = /full/path/to/file.ngc` - The file to show in the preview plot when AXIS starts.

docs/src/gui/gladevcp.adoc

@@ -1919,7 +1919,7 @@ image::images/offsetpage.png[align="center"]
 === HAL_sourceview widget
 
 This is for displaying and simple editing of G-code.
-It looks for `.ngc` highlighting specs in `~/share/gtksourceview-2.0/language-specs/`.
+It looks for `.ngc` highlighting specs in `~/share/gtksourceview-4/language-specs/`.
 The current running line will be highlighted.
 
 With external Python glue code it can:

docs/src/man/man1/mqtt-publisher.1.adoc

@@ -36,9 +36,12 @@ debian this is available from the `python3-paho-mqtt` package.
 
 == OPTIONS
 
-**keys=**__pin1_[,_pin2_,...]_::
-  The name of HAL pins, signals and other values to publish using MQTT.
-  The names are also used as the JSON keys in the MQTT message published with the broker.
+*keys*=_pin1[,pin2,...]_::
+
+    The name of HAL pins, signals and other values to publish using
+    MQTT.  The names are also used as the JSON keys in the MQTT
+    message published with the broker.  If multiple "keys=" options
+    are specified, the lists are merged.
 
 *--dryrun*::
   Do not set up MQTT connection, only print message to stdout.
@@ -88,23 +91,32 @@ Any set of HAL pins and signals can be published.
 This setup might be a useful starting point:
 
 ----
-loadusr -W mqtt-publisher [MQTT]DRYRUN --mqtt-broker=[MQTT]BROKER
-  --mqtt-user=[MQTT]USERNAME --mqtt-password=[MQTT]PASSWORD
-  keys=halui.axis.a.pos-feedback,halui.axis.b.pos-feedback,
-  halui.axis.c.pos-feedback,halui.axis.u.pos-feedback,
-  halui.axis.v.pos-feedback,halui.axis.w.pos-feedback,
-  halui.axis.x.pos-feedback,halui.axis.y.pos-feedback,
-  halui.axis.z.pos-feedback,halui.estop.is-activated,
-  halui.joint.0.is-homed,halui.joint.1.is-homed,halui.joint.2.is-homed,
-  halui.joint.3.is-homed,halui.joint.4.is-homed,halui.joint.5.is-homed,
-  halui.joint.6.is-homed,halui.joint.7.is-homed,halui.joint.8.is-homed,
-  halui.machine.is-on,halui.max-velocity.value,halui.mode.is-auto,
-  halui.mode.is-manual,halui.mode.is-mdi,halui.mode.is-teleop,
-  halui.program.is-running'
+loadusr -W mqtt-publisher \
+  [MQTT]DRYRUN \
+  --mqtt-broker=[MQTT]BROKER
+  --mqtt-user=[MQTT]USERNAME \
+  --mqtt-password=[MQTT]PASSWORD \
+  keys=halui.axis.a.pos-feedback,halui.axis.b.pos-feedback,\
+halui.axis.c.pos-feedback,halui.axis.u.pos-feedback,\
+halui.axis.v.pos-feedback,halui.axis.w.pos-feedback,\
+halui.axis.x.pos-feedback,halui.axis.y.pos-feedback,\
+halui.axis.z.pos-feedback \
+  keys=halui.estop.is-activated, halui.joint.0.is-homed,\
+halui.joint.1.is-homed,halui.joint.2.is-homed,halui.joint.3.is-homed,\
+halui.joint.4.is-homed,halui.joint.5.is-homed,halui.joint.6.is-homed,\
+halui.joint.7.is-homed,halui.joint.8.is-homed \
+  keys=halui.machine.is-on,halui.max-velocity.value,halui.mode.is-auto,
+halui.mode.is-manual,halui.mode.is-mdi,halui.mode.is-teleop,
+halui.program.is-running
 ----
 
-Note: The list of keys can not include space after comma.
-      The lines are appear broken only to avoid too long lines in the documentation.
+Note: It is recommended to use the line continuation character "\" as
+shown here to improve readability. But note that spaces must be left in
+to delimit options, and must not be included (including at the beginning
+of a line) inside a single option.
+
+HAL limits a single option/token (for example "keys=") to 255 characters.
+To work around this issue use multiple "keys=" entries as shown.
 
 == SEE ALSO
 

lib/python/gladevcp/gtksourceview.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<glade-catalog name="gtksourceview" library="gtksourceview-2.0" depends="gtk+">
+<glade-catalog name="gtksourceview" library="gtksourceview-4" depends="gtk+">
   <glade-widget-classes>
     <glade-widget-class name="GtkSourceView" title="GtkSourceView" generic-name="gtksourceview">
       <properties>

lib/python/gladevcp/hal_sourceview.py

@@ -25,7 +25,7 @@
 import gi
 gi.require_version("Gtk","3.0")
 gi.require_version("Gdk","3.0")
-gi.require_version("GtkSource","3.0")
+gi.require_version("GtkSource","4")
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GObject
@@ -62,10 +62,10 @@ def __init__(self, *a, **kw):
         self.lm = GtkSource.LanguageManager()
         self.sm = GtkSource.StyleSchemeManager()
         if 'EMC2_HOME' in os.environ:
-            path = os.path.join(os.environ['EMC2_HOME'], 'share/gtksourceview-2.0/language-specs/')
+            path = os.path.join(os.environ['EMC2_HOME'], 'share/gtksourceview-4/language-specs/')
             self.lm.set_search_path(self.lm.get_search_path() + [path])
 
-        self.buf.set_language(self.lm.get_language('.ngc'))
+        self.buf.set_language(self.lm.get_language('gcode'))
         self.set_show_line_numbers(True)
         self.set_show_line_marks(True)
         self.set_highlight_current_line(True)
@@ -116,7 +116,7 @@ def set_language(self, lang, path = None):
         # lang = the lang file to set
         if path == None:
             if 'EMC2_HOME' in os.environ:
-                path = os.path.join(os.environ['EMC2_HOME'], 'share/gtksourceview-2.0/language-specs/')
+                path = os.path.join(os.environ['EMC2_HOME'], 'share/gtksourceview-4/language-specs/')
         if path:
             self.lm.set_search_path(path)
         self.buf.set_language(self.lm.get_language(lang))