Merge branch '2.8' into 2.9

Author: hansu

docs/man/man9/motion.9

@@ -390,7 +390,7 @@ The velocity limit for the teleop planner.
 (\fBNote:\fR pins marked \fB(DEBUG)\fR serve as debugging aids and are subject to change or removal at any time.)
 
 .TP
-\fBjoint.\fIN\fB.joint\-acc\-cmd\fR OUT FLOAT \fB(DEBUG)\fR
+\fBjoint.\fIN\fB.acc\-cmd\fR OUT FLOAT \fB(DEBUG)\fR
 The joint's commanded acceleration.
 
 .TP
@@ -475,10 +475,8 @@ TRUE if the joint is using the "free planner" and has come to a stop.
 \fBjoint.\fIN\fB.index\-enable\fR IO BIT
 Should be attached to the index\-enable pin of the joint's encoder to enable homing to index pulse.
 
-.br
-.ns
-.TP
-\fBjoint.N.is\-unlocked\fR IN BIT
+.TQ
+\fBjoint.\fIN\fB.is\-unlocked\fR IN BIT
 Indicates joint is unlocked (see JOINT UNLOCK PINS).
 
 .TP
@@ -552,8 +550,8 @@ Should be driven TRUE if the positive limit switch for this joint is tripped.
 TRUE if the axis is a locked joint (typically a rotary) and a move is commanded (see JOINT UNLOCK PINS).
 
 .TP
-\fBjoint.\fIN\fB.joint\-vel\-cmd\fR OUT FLOAT \fB(DEBUG)\fR
-The joint's commanded velocity
+\fBjoint.\fIN\fB.vel\-cmd\fR OUT FLOAT \fB(DEBUG)\fR
+The joint's commanded velocity.
 
 .TP
 \fBjoint.\fIN\fB.wheel\-jog\-active\fR OUT BIT \fB(DEBUG)\fR

docs/src/Submakefile

@@ -480,36 +480,35 @@ SE := \" style=\"-moz-column-width: 25ex; \
 #     * the manpage section title
 #
 ADD_HTML_MANPAGES = \
-	@echo "Adding manpages: man$(strip $(1)): $(strip $(2))"; \
-	echo "$(SA)$(strip $(1))$(SB)$(strip $(1))$(SC)$(strip $(2))</a></p>" >> objects/index.incl; \
-	echo "$(SD)$(strip $(1))$(SE)" >> objects/index.incl; \
+	echo "Adding manpages: man$(strip $(2)): $(strip $(3))"; \
+	echo "$(SA)$(strip $(2))$(SB)$(strip $(2))$(SC)$(strip $(3))</a></p>" >> objects/index.incl; \
+	echo "$(SD)$(strip $(2))$(SE)" >> objects/index.incl; \
 	echo "<ul>" >> objects/index.incl; \
-	for HTML_FILE in $(filter $(DOC_DIR)/html/man/man$(strip $(1))/%.html, $(MAN_HTML_TARGETS)); do \
+	for HTML_FILE in $(filter $(DOC_DIR)/html/man/man$(strip $(1))/%.$(strip $(2)).html, $(MAN_HTML_TARGETS)); do \
 		BASENAME=$$(basename $$HTML_FILE .html); \
 		echo "<li><a href=\"$${HTML_FILE\#$(DOC_DIR)/html/}\">$${BASENAME%.*}</a></li>"; \
 	done >> objects/index.incl; \
-	echo "</ul></div>" >> objects/index.incl
+	echo "</ul></div>" >> objects/index.incl; \
 
 
 objects/index.incl: $(GENERATED_MANPAGES) objects/var-MAN_HTML_TARGETS $(DOC_SRCDIR)/Submakefile
 	rm -f $@
-	$(call ADD_HTML_MANPAGES, 1, Commands and non-realtime HAL components)
-	$(call ADD_HTML_MANPAGES, 9, Realtime HAL components)
-	$(call ADD_HTML_MANPAGES, 3hal, API calls: HAL)
-	$(call ADD_HTML_MANPAGES, 3rtapi, API calls: RTAPI)
-	$(call ADD_HTML_MANPAGES, 3hm2,  API calls: Hostmot2)
-	$(call ADD_HTML_MANPAGES, 3, API calls: General)
-
-	# now make sure all manpages made it into the html index
+	$(call ADD_HTML_MANPAGES, 1, 1, Commands and userspace components) \
+	$(call ADD_HTML_MANPAGES, 9, 9, Realtime components and kernel modules) \
+	$(call ADD_HTML_MANPAGES, 3, 3hal, API calls: HAL) \
+	$(call ADD_HTML_MANPAGES, 3, 3rtapi, API calls: RTAPI) \
+	$(call ADD_HTML_MANPAGES, 3, 3hm2,  API calls: Hostmot2) \
+	$(call ADD_HTML_MANPAGES, 3, 3, API calls: General) \
+	# now make sure all manpages made it into the html index \
 	FAIL=0; \
-	for F in $$(find $(DOC_DIR)/man/? -type f); do \
+	for F in $$(find $(DOC_DIR)/man/man* -type f); do \
 		B=$$(basename $$F); \
 		if ! grep -q $$B $@; then \
 			echo stray manpage not added to index: $$B; \
 			FAIL=1; \
 		fi; \
 	done; \
-	if [ $$FAIL -ne 0 ]; then false; fi
+	if [ $$FAIL -ne 0 ]; then exit 1; fi
 	mkdir -p $(DOC_DIR)/html/man/man/images/
 	find $(DOC_DIR)/man -name "*.png" ! -name "grohtml*" -exec mv {} "$(DOC_DIR)/html/man/man/images/" \;
 

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

@@ -1059,6 +1059,17 @@ This command now attempts to jog the zeroth joint (Joint0) provided
 the mode is free (not teleop).  To jog the X axis, the mode
 must be teleop and the corresponding command is: 'set jog x 1.234'.
 
+== Glade Virtual Control Panels
+
+In LinuxCNC 2.8 the Glade VCPs are loaded after the `POSTGUI_HALFILE` is loaded.
+So connecting the pins which are created by the Glade VCP in the
+`POSTGUI_HALFILE` is not possible any more in 2.8. Instead they need to be
+connected in a separate HAL file passed to the gladevcp command like this:
+
+----
+EMBED_TAB_COMMAND = gladevcp -H my_vcp_connect.hal -x {XID} my_vcp.glade
+----
+
 == Tools
 
 === Calibration (emccalib.tcl)