Skip to content

Commit f0d0cc2

Browse files
authored
Merge pull request #2537 from smoe/docs29_mac_102
Updates to documentation while reviewing translations (smoe:Docs29 mac 102)
2 parents a84db96 + b387866 commit f0d0cc2

30 files changed

+1011
-1602
lines changed

docs/man/man1/gs2_vfd.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
.TH gs2_vfd "1" "January 1, 2009" "GS2 VFD" "LinuxCNC Documentation"
2727

2828
.SH NAME
29-
\fBgs2_vfd\fR \- HAL non-realtime component for Automation Direct GS2 VFD's
29+
\fBgs2_vfd\fR \- HAL non-realtime component for Automation Direct GS2 VFDs
3030

3131
.SH SYNOPSIS
3232
.B gs2_vfd

docs/man/man1/milltask.1

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,16 @@
33
\fBmilltask\fR \- Non-realtime task controller for LinuxCNC
44
.SH DESCRIPTION
55

6-
\fBmilltask\fR is an internal process of LinuxCNC. It is generally not
7-
invoked directly but by an INI file setting: \fB[TASK]TASK=milltask\fR.
8-
The \fBmilltask\fR process creates the \fBini.*\fR HAL pins listed below
9-
and owned by the \fBinihal\fR component. These pins may be modified
10-
while LinuxCNC is running to alter values that are typically specified
11-
in an INI file.
6+
\fBmilltask\fR is an internal process of LinuxCNC.
7+
It is generally not invoked directly but by an INI file setting: \fB[TASK]TASK=milltask\fR.
8+
The \fBmilltask\fR process creates the \fBini.*\fR HAL pins listed below and owned by the \fBinihal\fR component.
9+
These pins may be modified while LinuxCNC is running to alter values that are typically statically specified in an INI file.
1210

13-
The \fBinihal\fR pins are sampled in every task cycle, however, commands
14-
affected by their values typically use the value present at the time
15-
when the command is processed. Such commands include all codes handled
16-
by the interpreter (\fBG-code\fR programs and \fBMDI\fR commands) and NML
17-
\fBjogging\fR commands issued by a GUI (including \fBhalui\fR).
18-
\fBWheel jogging\fR is implemented in the realtime motion module so
19-
\fBinihal\fR pin changes (e.g., ini.*.max_velocity,
20-
ini.*.max_acceleration) may be honored as soon as altered values are
21-
propagated to the motion module.
11+
The \fBinihal\fR pins are sampled in every task cycle, however,
12+
commands affected by their values typically use the value present at the time when the command is processed.
13+
Such commands include all codes handled by the interpreter (\fBG-code\fR programs and \fBMDI\fR commands)
14+
and NML \fBjogging\fR commands issued by a GUI (including \fBhalui\fR).
15+
\fBWheel jogging\fR is implemented in the realtime motion module so \fBinihal\fR pin changes (e.g., ini.*.max_velocity, ini.*.max_acceleration) may be honored as soon as altered values are propagated to the motion module.
2216

2317
.SH PINS
2418
.SS Per-joint pins (N == joint number)
@@ -100,13 +94,7 @@ Allows adjustment of \fB[TRAJ]ARC_BLEND_RAMP_FREQ
10094

10195
.SH NOTES
10296

103-
The \fBinihal\fR pins cannot be linked or set in a HAL file that is
104-
specified by an INI file \fB[HAL]HALFILE\fR item because they are not created
105-
until \fBmilltask\fR is started. The \fBinihal\fR pin values can be
106-
altered by independent halcmd programs specified by
107-
\fB[APPLICATION]APP\fR items or by GUIs that support a
108-
\fB[HAL]POSTGUI_HALFILE\fR.
97+
The \fBinihal\fR pins cannot be linked or set in a HAL file that is specified by an INI file \fB[HAL]HALFILE\fR item because they are not created until \fBmilltask\fR is started.
98+
The \fBinihal\fR pin values can be altered by independent halcmd programs specified by \fB[APPLICATION]APP\fR items or by GUIs that support a \fB[HAL]POSTGUI_HALFILE\fR.
10999

110-
The INI file is not automatically updated with values altered by
111-
\fBinihal\fR pin settings but can be updated using the calibration
112-
program (emccalib.tcl) when using a \fB[HAL]POSTGUI_HALFILE\fR.
100+
The INI file is not automatically updated with values altered by \fBinihal\fR pin settings but can be updated using the calibration program (emccalib.tcl) when using a \fB[HAL]POSTGUI_HALFILE\fR.

docs/man/man3/hal_add_funct_to_thread.3hal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This determines how often and in what order functions are executed.
3232
Returns a HAL status code.
3333

3434
.SH REALTIME CONSIDERATIONS
35-
Call only from realtime init code, not from realtime or non-realtime code.
35+
Call only from realtime init code, not from other realtime or non-realtime code.
3636

3737
.SH SEE ALSO
3838
\fBhal_thread_new(3hal)\fR, \fBhal_export_funct(3hal)\fR

docs/man/man3/hal_create_thread.3hal

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,21 @@ The name of the thread
1818
The interval, in nanoseconds, between iterations of the thread
1919

2020
.IP \fIuses_fp\fR
21-
Must be nonzero if a function which uses floating-point will be attached
22-
to this thread.
21+
Must be nonzero if a function which uses floating-point will be attached to this thread.
2322

2423
.SH DESCRIPTION
25-
\fBhal_create_thread\fR establishes a realtime thread that will
26-
execute one or more HAL functions periodically.
24+
\fBhal_create_thread\fR establishes a realtime thread that will execute one or more HAL functions periodically.
2725

28-
All thread periods are rounded to integer multiples of the hardware timer
29-
period, and the timer period is based on the first thread created. Threads
30-
must be created in order, from the fastest to the slowest. HAL assigns
31-
decreasing priorities to threads that are created later, so creating them
32-
from fastest to slowest results in rate monotonic priority scheduling.
26+
All thread periods are rounded to integer multiples of the hardware timer period,
27+
and the timer period is based on the first thread created.
28+
Threads must be created in order, from the fastest to the slowest.
29+
HAL assigns decreasing priorities to threads that are created later,
30+
so creating them from fastest to slowest results in rate monotonic priority scheduling.
3331

3432
\fBhal_delete_thread\fR deletes a previously created thread.
3533

3634
.SH REALTIME CONSIDERATIONS
37-
Call only from realtime init code, not from realtime or non-realtime code.
35+
Call only from realtime init code, not from other realtime or non-realtime code.
3836

3937
.SH RETURN VALUE
4038
Returns a HAL status code.

docs/man/man3/hm2_allocate_bspi_tram.3hm2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This function allocates the TRAM memory and sets up the regular data transfers.
2222
It should be called only when all the frames have been defined by calls to hm2_tram_add_bspi_frame().
2323

2424
.SH REALTIME CONSIDERATIONS
25-
Call only from realtime init code, not from realtime code or non-realtime components.
25+
Call only from realtime init code, not from other realtime code or non-realtime components.
2626

2727
.SH RETURN VALUE
2828
Returns 0 on success and \-1 on failure.

docs/man/man3/hm2_bspi_set_read_function.3hm2

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
.TH hm2_bspi_set_read_function "3hm2" "2011-05-31" "LinuxCNC Documentation" "Hostmot2"
55
.SH NAME
66

7-
hm2_bspi_set_read_function \- Register a function to handle the tram write phase
8-
of a hostmot2 buffered SPI driver.
7+
hm2_bspi_set_read_function \- Register a function to handle the tram write phase of a hostmot2 buffered SPI driver.
98
.SH SYNTAX
109
.nf
1110
.B #include <hostmot2-serial.h>
@@ -14,28 +13,25 @@ int hm2_bspi_set_read_function(char *name, void *func, void *subdata)
1413

1514
.SH DESCRIPTION
1615
\fBhm2_bspi_set_read_function\fR registers a function in an external driver
17-
to be called every time that the main Hostmot2
18-
driver calls the generic "process_tram_read" function.
19-
The names of the available channels are printed with rtapi_print_msg during the
20-
driver loading process and take the form:
16+
to be called every time that the main Hostmot2 driver calls the generic "process_tram_read" function.
17+
The names of the available channels are printed with rtapi_print_msg during the driver loading process and take the form:
2118
.RS
2219
hm2_<board name>.<board index>.bspi.<index>
2320
.RE
2421
For example hm2_5i23.0.bspi.0.
2522

26-
"func" should be a pointer to a function in the sub driver which is to be
27-
called to process the results of the BSPI TRAM read phase. The function must
28-
take a single argument, a pointer to an individual instance of the internal
29-
driver. If defined in comp then the function must \fBnot\fP use the FUNCTION()
30-
convenience macro, and the argument to the function in the definition must
31-
\fBalways\fP be (struct state *inst).
23+
"func" should be a pointer to a function in the sub driver
24+
which is to be called to process the results of the BSPI TRAM read phase.
25+
The function must take a single argument, a pointer to an individual instance of the internal driver.
26+
If defined in comp then the function must \fBnot\fP use the FUNCTION() convenience macro,
27+
and the argument to the function in the definition must \fBalways\fP be (struct state *inst).
3228

33-
"subdata" is a pointer to the driver instance internal data. In the case of a
34-
driver written in comp this will always be "inst" in the function call and the
35-
call should be anywhere in the EXTRA_SETUP code.
29+
"subdata" is a pointer to the driver instance internal data.
30+
In the case of a driver written in comp this will always be "inst" in the function call and
31+
the call should be anywhere in the EXTRA_SETUP code.
3632

3733
.SH REALTIME CONSIDERATIONS
38-
Call only from realtime init code, not from realtime code or non-realtime components.
34+
Call only from realtime init code, not from other realtime code or non-realtime components.
3935

4036
.SH RETURN VALUE
4137
Returns 0 on success and \-1 on failure.

docs/man/man3/hm2_bspi_set_write_function.3hm2

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
.TH hm2_bspi_set_write_function "3hm2" "2011-05-31" "LinuxCNC Documentation" "Hostmot2"
55
.SH NAME
66

7-
hm2_bspi_set_write_function \- Register a function to handle the tram write phase
8-
of a hostmot2 buffered SPI driver.
7+
hm2_bspi_set_write_function \- Register a function to handle the tram write phase of a hostmot2 buffered SPI driver.
98
.SH SYNTAX
109
.nf
1110
.B #include <hostmot2-serial.h>
@@ -14,30 +13,26 @@ int hm2_bspi_set_write_function(char *name, void *func, void *subdata)
1413

1514
.SH DESCRIPTION
1615
\fBhm2_bspi_set_write_function\fR registers a function in an external driver
17-
to be called every time that the main Hostmot2
18-
driver calls the generic "prepare_tram_write" functions.
19-
The names of the available channels are printed with rtapi_print_msg during the
20-
driver loading process and take the form:
16+
to be called every time that the main Hostmot2 driver calls the generic "prepare_tram_write" functions.
17+
The names of the available channels are printed with rtapi_print_msg during the driver loading process and take the form:
2118
.RS
2219
hm2_<board name>.<board index>.bspi.<index>
2320
.RE
2421
For example hm2_5i23.0.bspi.0.
2522

26-
"func" should be a pointer to a function in the sub driver which is to be
27-
called to process the pins into BSPI write registers prior to the regular TRAM
28-
write phase. The function must take a single argument, a pointer to an
29-
individual instance of the internal driver. If defined in comp then the
30-
function must \fBnot\fP use the FUNCTION() convenience macro, and the argument
31-
to the function in the definition must \fBalways\fP be (struct state *inst).
23+
"func" should be a pointer to a function in the sub driver
24+
which is to be called to process the pins into BSPI write registers prior to the regular TRAM write phase.
25+
The function must take a single argument, a pointer to an individual instance of the internal driver.
26+
If defined in comp then the function must \fBnot\fP use the FUNCTION() convenience macro,
27+
and the argument to the function in the definition must \fBalways\fP be (struct state *inst).
3228

33-
"subdata" is a pointer to the driver instance internal data. In the case of a
34-
driver written in comp this will always be "inst" in the function call.
29+
"subdata" is a pointer to the driver instance internal data.
30+
In the case of a driver written in comp this will always be "inst" in the function call.
3531

36-
If using comp then the call to this function should be anywhere in the
37-
EXTRA_SETUP code.
32+
If using comp then the call to this function should be anywhere in the EXTRA_SETUP code.
3833

3934
.SH REALTIME CONSIDERATIONS
40-
Call only from realtime init code, not from realtime code or non-realtime components.
35+
Call only from realtime init code, not from other realtime code or non-realtime components.
4136

4237
.SH RETURN VALUE
4338
Returns 0 on success and \-1 on failure.

docs/man/man3/hm2_bspi_setup_chan.3hm2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Set to 1 to sample the received SPI data 1/2 SPI clock later than normal.
5656
This is useful when high clock rates or isolation cause significant delays from clock to received data.
5757

5858
.SH REALTIME CONSIDERATIONS
59-
Call only from within realtime init/cleanup code or non-realtime components, not from relatime tasks.
59+
Call only from within realtime init/cleanup code or non-realtime components, not from realtime tasks.
6060

6161
.SH RETURN VALUE
6262
Returns 0 on success and \-1 on failure.

docs/man/man3/hm2_tram_add_bspi_frame.3hm2

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,18 @@ hm2_tram_add_bspi_frame \- add a register-write to the Hostmot2 TRAM
1212
hm2_tram_add_bspi_frame(char *name, int chan, u32 **wbuff, u32 **rbuff)
1313

1414
.SH DESCRIPTION
15-
\fBhm2_tram_add_bspi_frame\fR Add a regular (every thread) write event to the
16-
Hostmot2 tram for bspi instance "name". "name" is a unique string given to each
17-
bspi channel during hostmot2 setup. The names of the available
18-
channels are printed to standard output during the driver loading process and
19-
take the form:
15+
\fBhm2_tram_add_bspi_frame\fR Add a regular (every thread) write event to the Hostmot2 tram for bspi instance "name".
16+
"name" is a unique string given to each bspi channel during hostmot2 setup.
17+
The names of the available channels are printed to standard output during the driver loading process and take the form:
2018
hm2_<board name>.<board index>.bspi.<index> For example hm2_5i23.0.bspi.0
2119

22-
This function is used to add a regular, every thread, write or write-read
23-
transaction to the Translation RAM system. A write need not have a read (use 0
24-
for **rbuff) but it is an error to have a read without a write. Note that the
25-
TRAM list is not actioned until the hm2_allocate_bspi_tram function is called.
26-
The read and write parameters must be pointers to pointers, as TRAM re-maps the
27-
buffers into contiguous memory.
20+
This function is used to add a regular, every thread, write or write-read transaction to the Translation RAM system.
21+
A write need not have a read (use 0 for **rbuff) but it is an error to have a read without a write.
22+
Note that the TRAM list is not actioned until the hm2_allocate_bspi_tram function is called.
23+
The read and write parameters must be pointers to pointers, as TRAM re-maps the buffers into contiguous memory.
2824

2925
.SH REALTIME CONSIDERATIONS
30-
Call only from realtime init code, not from realtime code or non-realtime components.
26+
Call only from realtime init code, not from other realtime code or non-realtime components.
3127

3228
.SH RETURN VALUE
3329
Returns 0 on success and \-1 on failure.

0 commit comments

Comments
 (0)