Skip to content

Commit 3633289

Browse files
authored
Merge pull request #1553 from hansu/docs-2.8
Some work on docs (2.8)
2 parents e4d59eb + 33c749d commit 3633289

6 files changed

Lines changed: 48 additions & 8 deletions

File tree

docs/man/man1/halshow.1

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,35 @@
2424
.\"
2525
.TH HALSHOW "1" "2020-08-26" "LinuxCNC Documentation" "The Enhanced Machine Controller"
2626
.SH NAME
27-
halshow \- short description
27+
halshow \- Show HAL parameters, pins and signals
2828
.SH SYNOPSIS
29-
.B halshow
29+
.B halshow [Options] [watchfile]
3030

31+
.SH OPTIONS
32+
--help (help)
33+
--fformat format_string_for_float
34+
--iformat format_string_for_int
35+
36+
For format see
37+
.UR https://www.tcl.tk/man/tcl8.6.11/TclCmd/format.html
38+
.UE
39+
40+
Example:
41+
"%.5f" displays a float with 5 digits right of the decimal point
3142
.SH DESCRIPTION
3243
\fBhalshow\fR creates a GUI interface to view and interact with a running
3344
HAL session.
3445
It is documented in the PDF and HTML docs much more completely than is
3546
possible in a manpage:
36-
http://linuxcnc.org/docs/html/hal/halshow.html
37-
47+
.UR http://linuxcnc.org/docs/html/hal/halshow.html
48+
.UE
3849

3950
.SH "SEE ALSO"
4051
\fBLinuxCNC(1)\fR
4152

4253
Much more information about LinuxCNC and HAL is available in the LinuxCNC
4354
and HAL User Manuals, found at /usr/share/doc/LinuxCNC/.
4455

45-
.SH HISTORY
46-
4756
.SH BUGS
4857
None known at this time.
4958
.PP

docs/src/config/python-interface.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,10 @@ machine linear units per mm, reflects [TRAJ]LINEAR_UNITS ini value.
259259
reflects 'iocontrol.0.lube_level'.
260260

261261
*max_acceleration*:: '(returns float)' -
262-
maximum acceleration. reflects [TRAJ]MAX_ACCELERATION.
262+
maximum acceleration. Reflects [TRAJ]MAX_ACCELERATION.
263263

264264
*max_velocity*:: '(returns float)' -
265-
maximum velocity. reflects [TRAJ]MAX_VELOCITY.
265+
maximum velocity. Reflects the current maximum velocity. If not modified by halui.max-velocity or similar it should reflect [TRAJ]MAX_VELOCITY.
266266

267267
*mcodes*:: '(returns tuple of 10 integers)' -
268268
currently active M-codes.

docs/src/hal/halshow.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ and used a file named my.halshow in the current directory:
4242
----
4343
$ halshow --fformat ".5f" ./my.halshow
4444
----
45+
For more information regarding the format, please refer to https://www.tcl.tk/man/tcl8.6.11/TclCmd/format.html
4546

4647
== HAL Tree Area
4748

src/hal/components/and2.comp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ Otherwise,
1313
.RE"""
1414
;
1515
function _ nofp;
16+
see_also """
17+
.ie '\\*[.T]'html' \\{\\
18+
.UR logic.9.html
19+
\\fBlogic\\fR(9)
20+
.UE
21+
\\}
22+
.el \\{\\
23+
\\fBlogic\\fR(9)
24+
\\}
25+
""";
1626
license "GPL";
1727
;;
1828
FUNCTION(_) { out = in0 && in1; }

src/hal/components/or2.comp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ Otherwise,
1414
.RE"""
1515
;
1616
function _ nofp;
17+
see_also """
18+
.ie '\\*[.T]'html' \\{\\
19+
.UR logic.9.html
20+
\\fBlogic\\fR(9)
21+
.UE
22+
\\}
23+
.el \\{\\
24+
\\fBlogic\\fR(9)
25+
\\}
26+
""";
1727
license "GPL";
1828
;;
1929
FUNCTION(_) { out = in0 || in1; }

src/hal/components/xor2.comp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ to the following rule:
1414
Otherwise,
1515
\\fBout=FALSE\\fR""";
1616
function _ nofp;
17+
see_also """
18+
.ie '\\*[.T]'html' \\{\\
19+
.UR logic.9.html
20+
\\fBlogic\\fR(9)
21+
.UE
22+
\\}
23+
.el \\{\\
24+
\\fBlogic\\fR(9)
25+
\\}
26+
""";
1727
license "GPL";
1828
;;
1929
FUNCTION(_) {

0 commit comments

Comments
 (0)