Skip to content

Commit 1a7e06e

Browse files
authored
Merge pull request #2357 from smoe/docs29_misc_16
What popped up while reviewing/adapting translations (smoe docs29_misc_16)
2 parents e469033 + b902e29 commit 1a7e06e

17 files changed

Lines changed: 313 additions & 375 deletions

docs/man/man1/mitsub_vfd.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,6 @@ net estop-out coolant.estop
222222

223223
.SH ISSUES
224224

225-
Some models (eg E500) cannot monitor status, so set the monitor pin to false.
225+
Some models, e.g. E500, cannot monitor status, so set the monitor pin to false.
226226
In this case, pins such as up-to-speed, amps, alarm and status bits are not useful.
227227

docs/man/man1/qtvcp.1

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ qtvcp \- Qt-based virtual control panels
3030
[\fIOPTIONS\fR] myfile.ui
3131

3232
.SH DESCRIPTION
33-
\fBqtvcp\fR is a system for creating user interfaces for LinuxCNC.
33+
\fBQtVCP\fR is a system for creating user interfaces for LinuxCNC.
3434

3535
Full documentation at http://linuxcnc.org/docs/html/gui/qtvcp.html
3636

@@ -62,8 +62,7 @@ Use -g WIDTHxHEIGHT for just setting size or -g +XOFFSET+YOFFSET for just positi
6262
Example: -g 200x400+0+100.
6363
.TP
6464
\fB\-H\fR [\fI<FILE>\fR]
65-
Execute HAL statements from FILE with halcmd after the
66-
component is set up and ready.
65+
Execute HAL statements from FILE with halcmd after the component is set up and ready.
6766
.TP
6867
\fB\-i\fR
6968
Enable info output.
@@ -78,28 +77,24 @@ Force panel window to fullscreen.
7877
Set Qt style. Default is system theme.
7978
.TP
8079
\fB\-x\fR [\fI<XID>\fR]
81-
Reparent Qtvcp into an existing window XID instead of creating
82-
a new top level window.
80+
Reparent QtVCP into an existing window XID instead of creating a new top level window.
8381
.TP
8482
\fB\--push_xid\fR
85-
Reparent window into a plug add push the plug xid number to
86-
standardout.
83+
Reparent window into a plug add push the plug xid number to standardout.
8784
.TP
8885
\fB\-u\fR [\fI<USERMOD>\fR]
8986
File path of user defined handler file.
9087
.TP
9188
\fB\-o\fR [\fI<USEROPTS>\fR]
92-
Pass USEROPTS strings to handler under self.w.USEROPTIONS_ list
93-
variable.
89+
Pass USEROPTS strings to handler under self.w.USEROPTIONS_ list variable.
9490

9591
.SH "SEE ALSO"
9692
\fBLinuxCNC(1)\fR
9793

98-
Much more information about LinuxCNC and HAL is available in the LinuxCNC
99-
and HAL User Manuals, found at /usr/share/doc/LinuxCNC/.
94+
Much more information about LinuxCNC and HAL is available in the LinuxCNC and HAL User Manuals, found at /usr/share/doc/LinuxCNC/.
10095

10196
.SH BUGS
102-
None known at this time.
97+
None known at this time.
10398
.PP
10499
.SH AUTHOR
105100
This man page written by andypugh, as part of the LinuxCNC project.
@@ -108,5 +103,5 @@ Report bugs at https://github.com/LinuxCNC/linuxcnc/issues
108103
.SH COPYRIGHT
109104
Copyright \(co 2020 andypugh.
110105
.br
111-
This is free software; see the source for copying conditions. There is NO
112-
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
106+
This is free software; see the source for copying conditions.
107+
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

docs/man/man9/hostmot2.9

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ Sets the master RC PWM frequency. Maximum is 1 kHz, minimum is .01 Hz. Defaults
871871

872872
.TP
873873
(float rw) width
874-
Sets the per channel pulse width in (ms/scale)
874+
Sets the per channel pulse width in (ms/scale).
875875

876876
.TP
877877
(float rw) offset
@@ -1123,7 +1123,7 @@ Only full GPIO pins have this parameter.
11231123
(bit r/w) is_opendrain
11241124
This parameter only has an effect if the "is_output" parameter is True.
11251125
If this parameter is False, the GPIO behaves as a normal output pin:
1126-
the IO pin on the connector is driven to the value specified by the "out" HAL pin (possibly inverted), and the value of the "in" and "in_not" HAL pins is undefined.
1126+
The IO pin on the connector is driven to the value specified by the "out" HAL pin (possibly inverted), and the value of the "in" and "in_not" HAL pins is undefined.
11271127
If this parameter is True, the GPIO behaves as an open-drain pin.
11281128
Writing 0 to the "out" HAL pin drives the IO pin low, writing 1 to the "out" HAL pin puts the IO pin in a high-impedance state.
11291129
In this high-impedance state the IO pin floats (weakly pulled high), and other devices can drive the value;

docs/man/man9/lcd.9

Lines changed: 46 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ lcd \- Stream HAL data to an LCD screen
88
.SH FUNCTIONS
99
.TP
1010
\fBlcd\fR (requires a floating-point thread).
11-
All LCD instances are updated by the same function.
11+
All LCD instances are updated by the same function.
1212

1313
.SH PINS
1414
.TP
@@ -17,7 +17,7 @@ The output byte stream is sent via this pin. One character is sent every thread
1717
invocation. There in no handshaking provided.
1818
.TP
1919
.B lcd.\fINN\fB.page.\fIPP.\fBarg.\fINN\fR (float/s32/u32/bit) in
20-
The input pins have types matched to the format string specifiers.
20+
The input pins have types matched to the format string specifiers.
2121
.TP
2222
.B lcd.\fINN\fB.page_num\fR (u32) in
2323
Selects the page number. Multiple layouts may be defined, and this pin switches
@@ -26,7 +26,7 @@ between them.
2626
.B lcd.\fINN\fB.contrast\fR (float) in
2727
Attempts to set the contrast of the LCD screen using the byte sequence ESC C and
2828
then a value from 0x20 to 0xBF (matching the Mesa 7I73).
29-
The value should be between 0 and 1.
29+
The value should be between 0 and 1.
3030

3131
.SH PARAMETERS
3232
.TP
@@ -38,121 +38,103 @@ parameter to 44 (0x2C).
3838
.SH DESCRIPTION
3939

4040
\fBlcd\fR takes format strings much like those used in C and many other languages
41-
in the printf and scanf functions and their variants.
41+
in the printf and scanf functions and their variants.
4242

4343
The component was written specifically to support the Mesa 7I73 pendant controller,
4444
however, it may be of use streaming data to other character devices
4545
and, as the output format mimics the ADM3 terminal format, it could be used
46-
to stream data to a serial device. Perhaps even a genuine ADM3.
47-
The strings contain a mixture of text values (which are displayed directly),
48-
"escaped" formatting codes and numerical format descriptors.
49-
For a detailed description of formatting codes see:
50-
http://en.wikipedia.org/wiki/Printf
51-
52-
The component can be configured to display an unlimited number of
53-
differently-formatted pages, which may be selected with a HAL pin.
46+
to stream data to a serial device. Perhaps even a genuine ADM3.
47+
The strings contain a mixture of text values (which are displayed directly),
48+
"escaped" formatting codes and numerical format descriptors.
49+
For a detailed description of formatting codes see: http://en.wikipedia.org/wiki/Printf .
50+
51+
The component can be configured to display an unlimited number of differently-formatted pages, which may be selected with a HAL pin.
5452
.TP
5553
\fBEscaped codes\fR
56-
\en Inserts a clear-to-end, carriage return and line feed character. This will
57-
still linefeed and clear even if an automatic wrap has occurred (lcd has no
58-
knowledge of the width of the lcd display.) To print in the rightmost column it
59-
is necessary to allow the format to wrap and omit the \en code.
60-
61-
\et Inserts a tab (actually 4 spaces in the current version rather than a true
62-
tab.)
63-
64-
\eNN inserts the character defined by the hexadecimal code NN.
65-
As the ',' character is used in the format string to separate LCD instances
66-
it must be represented by \e2C in the format string. (the decimal
67-
separator is handled differently)
68-
54+
\en Inserts a clear-to-end, carriage return and line feed character.
55+
This will still linefeed and clear even if an automatic wrap has occurred (lcd has no knowledge of the width of the lcd display).
56+
To print in the rightmost column it is necessary to allow the format to wrap and omit the \en code.
57+
58+
\et Inserts a tab (actually 4 spaces in the current version rather than a true tab.)
59+
60+
\eNN inserts the character defined by the hexadecimal code NN.
61+
As the ',' character is used in the format string to separate LCD instances it must be represented by \e2C in the format string (the decimal separator is handled differently).
62+
6963
\e\e Inserts a literal \e.
7064

7165
.TP
7266
\fBNumerical formats\fR
7367

7468
\fBlcd\fR differs slightly from the standard printf conventions.
75-
One significant difference is that width limits are strictly enforced to prevent the LCD display
76-
wrapping and spoiling the layout. The field width includes the sign character
77-
so that negative numbers will often have a smaller valid range than positive.
69+
One significant difference is that width limits are strictly enforced to prevent the LCD display wrapping and spoiling the layout.
70+
The field width includes the sign character so that negative numbers will often have a smaller valid range than positive.
7871
Numbers that do not fit in the specified width are displayed as a line of asterisks (\fB********\fR).
7972

8073
Each format begins with a "%" symbol. (For a literal % use "%%").
8174
Immediately after the % the following modifiers may be used:
8275

8376
" " (space) Pad the number to the specified width with spaces.
84-
This is the default and is not strictly necessary.
77+
This is the default and is not strictly necessary.
8578

86-
"0" Pad the number to the specified width with the numeral 0.
79+
"0" Pad the number to the specified width with the numeral 0.
8780

88-
"+" Force display of a + symbol before positive numbers. This (like the \- sign)
89-
will appear immediately to the left of the digits for a space-padded number
90-
and in the extreme left position for a 0-padded number.
81+
"+" Force display of a + symbol before positive numbers.
82+
This (like the \- sign) will appear immediately to the left of the digits for a space-padded number and in the extreme left position for a 0-padded number.
9183

92-
"1234567890" A numerical entry (other than the leading 0 above) defines the
93-
total number of characters to display including the decimal separator and the sign.
84+
"1234567890" A numerical entry (other than the leading 0 above) defines the total number of characters to display including the decimal separator and the sign.
9485
Whilst this number can be as many digits as required, the maximum field width is 20 characters.
95-
The inherent precision of the "double" data type means
96-
that more than 14 digits will tend to show errors in the least significant digits.
97-
The integer data types will never fill more than 10 decimal digits.
86+
The inherent precision of the "double" data type means that more than 14 digits will tend to show errors in the least significant digits.
87+
The integer data types will never fill more than 10 decimal digits.
9888

9989
Following the width specifier should be the decimal specifier.
100-
This can only be a full-stop character (.) as the comma (,) is used as the instance separator.
101-
Currently lcd does not access the locale information to determine the correct separator
102-
but the \fBdecimal\-separator\fR HAL parameter can be used to choose any desired separator.
90+
This can only be a full-stop character (.) as the comma (,) is used as the instance separator.
91+
Currently lcd does not access the locale information to determine the correct separator but the \fBdecimal\-separator\fR HAL parameter can be used to choose any desired separator.
10392

104-
Following the decimal separator should be a number that determines
105-
how many places of decimals to display. This entry is ignored in the case of integer formats.
93+
Following the decimal separator should be a number that determines how many places of decimals to display. This entry is ignored in the case of integer formats.
10694

107-
All the above modifiers are optional, but to specify a decimal precision the
108-
decimal point must precede the precision, e.g., as in "%.3f".
95+
All the above modifiers are optional, but to specify a decimal precision the decimal point must precede the precision, e.g., as in "%.3f".
10996
The default decimal precision is 4.
11097

11198
The numerical formats supported are:
11299

113100
\fB%f %F\fR (for example, %+09.3f) These create a floating-point type HAL pin.
114-
The example would be displayed in a 9-character field, with 3 places of decimals,
115-
as a decimal separator, padded to the left with 0s and with a sign displayed for
116-
both positive and negative. Conversely a plain %f would be 6 digits of decimal,
101+
The example would be displayed in a 9-character field, with 3 places of decimals, as a decimal separator,
102+
padded to the left with 0s and with a sign displayed for both positive and negative. Conversely a plain %f would be 6 digits of decimal,
117103
variable format width, with a sign only shown for negative numbers.
118-
Both %f and %F create exactly the same format.
104+
Both %f and %F create exactly the same format.
119105

120106
\fB%i %d\fR (For example %+ 4d) Creates a signed (s32) HAL pin.
121-
The example would display the value at a fixed 4 characters, space padded,
122-
width including the "+" giving a range of +999 to \-999. %i and %d create identical output.
107+
The example would display the value at a fixed 4 characters, space padded, width including the "+" giving a range of +999 to \-999. %i and %d create identical output.
123108

124109
\fB%u\fR (for example %08u) Creates an unsigned (u32) HAL pin.
125-
The example would be a fixed 8 characters wide, padded with zeros.
110+
The example would be a fixed 8 characters wide, padded with zeros.
126111

127112
\fB%x, %X\fR Creates an unsigned (u32) HAL pin and displays the value in Hexadecimal.
128113
Both %x and %X display capital letters for digits ABCDEF.
129-
A width may be specified, though the u32 HAL type is only 8 hex digits wide.
114+
A width may be specified, though the u32 HAL type is only 8 hex digits wide.
130115

131-
\fB%o\fR Creates an unsigned (u32) pin and displays the value in octal representation.
116+
\fB%o\fR Creates an unsigned (u32) pin and displays the value in octal representation.
132117

133118
\fB%c\fR Creates a u32 HAL pin and displays the character corresponding to the value of the pin.
134-
Values less than 32 (space) are suppressed. A width specifier may be used,
135-
for example %20c might be used to create a complete line of one character.
119+
Values less than 32 (space) are suppressed. A width specifier may be used, for example %20c might be used to create a complete line of one character.
136120

137121
\fB%b\fR This specifier has no equivalent in printf.
138122
It creates a bit (boolean) type HAL pin. The b should be followed by two characters
139123
and the display will show the first of these when the pin is true, and the second when false.
140124
Note that the characters follow, not precede the "b", unlike the case with other formats.
141125
The characters may be "escaped" Hex values.
142-
For example "%b\eFF " will display a solid black block if true,
143-
and a space if false and "%b\e7F\e7E" would display right-arrow for false and left-arrow for true.
144-
An unexpected value of 'E' indicates a formatting error.
126+
For example "%b\eFF " will display a solid black block if true, and a space if false and "%b\e7F\e7E" would display right-arrow for false and left-arrow for true.
127+
An unexpected value of 'E' indicates a formatting error.
145128

146129
\fBPages\fR
147130
The page separator is the "|" (pipe) character (if the actual character is needed then \e7C may be used).
148-
A "Page" in this context refers to a separate format which may be displayed on the same display.
131+
A "Page" in this context refers to a separate format which may be displayed on the same display.
149132

150133
\fBInstances\fR
151134
The instance separator is the comma. This creates a completely separate lcd instance,
152-
for example to drive a second lcd display on the second 7I73.
153-
The use of comma to separate instances is built in to the modparam reading code
154-
so not even escaped commas "\e," can be used.
155-
A comma may be displayed by using the \e2C sequence.
135+
for example to drive a second lcd display on the second 7I73.
136+
The use of comma to separate instances is built in to the modparam reading code so not even escaped commas "\e," can be used.
137+
A comma may be displayed by using the \e2C sequence.
156138

157139
.SH AUTHOR
158140
Andy Pugh

0 commit comments

Comments
 (0)