Skip to content

Commit 8c65162

Browse files
authored
Merge pull request #2391 from LinuxCNC/hal_parport-is-realtime
docs: rename hal_parport.1 to hal_parport.9, because it's a realtime …
2 parents 54ccc18 + d13d8c1 commit 8c65162

97 files changed

Lines changed: 243 additions & 251 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.realtime-nomenclature

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
problematic stuff remaining:
2+
3+
halcmd:
4+
loadusr
5+
unloadusr
6+
7+
"show comp" has a Type column that says either "RT" or "User"
8+
9+
halcompile:
10+
--userspace
11+
option userspace
12+
option userinit
13+
user_mainloop()
14+
15+
hal_lib:
16+
ULAPI vs RTAPI
17+
18+
hal_parport should move from man1 to man9

debian/linuxcnc.install.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ usr/share/man/man1/hal-histogram.1
161161
usr/share/man/man1/hal_input.1
162162
usr/share/man/man1/hal_manualtoolchange.1
163163
usr/share/man/man1/halmeter.1
164-
usr/share/man/man1/hal_parport.1
165164
usr/share/man/man1/halreport.1
166165
usr/share/man/man1/halrmt.1
167166
usr/share/man/man1/halrun.1

docs/man/man1/debuglevel.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
.\"
2525
.TH DEBUGLEVEL "1" "2020-08-26" "LinuxCNC Documentation" "The Enhanced Machine Controller"
2626
.SH NAME
27-
debuglevel \- sets the debug level for the userspace part of LinuxCNC
27+
debuglevel \- sets the debug level for the non-realtime part of LinuxCNC
2828
.SH SYNOPSIS
2929
.B debuglevel
3030
\fI\-ini\fR \fIINIFILE\fR

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 userspace component for Automation Direct GS2 VFD's
29+
\fBgs2_vfd\fR \- HAL non-realtime component for Automation Direct GS2 VFD's
3030

3131
.SH SYNOPSIS
3232
.B gs2_vfd

docs/man/man1/hal_manualtoolchange.1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Man page for hal_manualtoolchange userspace component.
1+
.\" Man page for hal_manualtoolchange non-realtime component.
22
.\" Written 05 APR 2017 by Joe Hildreth (joeh@threerivershospital.com)
33
.\"
44
.\" This is free documentation; you can redistribute it and/or
@@ -20,13 +20,13 @@
2020
.\" License along with this manual; if not, write to the Free
2121
.\" Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
2222
.\" USA.
23-
.TH hal_manualtoolchange 1 "04 APR 2017" "LinuxCNC Documentation" "HAL Userspace Component"
23+
.TH hal_manualtoolchange 1 "04 APR 2017" "LinuxCNC Documentation" "HAL Non-realtime Component"
2424
.SH NAME
25-
hal_manualtoolchange \- HAL userspace component to enable manual tool changes.
25+
hal_manualtoolchange \- HAL non-realtime component to enable manual tool changes.
2626
.SH SYNOPSIS
2727
loadusr hal_manualtoolchange
2828
.SH DESCRIPTION
29-
hal_manualtoolchange is a LinuxCNC userspace component that allows users with machines lacking automatic tool changers to make manual tool changes.
29+
hal_manualtoolchange is a LinuxCNC non-realtime component that allows users with machines lacking automatic tool changers to make manual tool changes.
3030
In use when a M6 tool change is encountered, the motion component will stop the spindle and pause the program.
3131
The hal_manualtoolchange component will then receive a signal from the motion component causing it to display a tool change window prompting the user which tool number to load based on the last T\- number programmed.
3232
The dialog will stay active until the "continue" button is pressed. When the "continue" button is pressed, hal_manualtoolchange will then signal the motion component that the tool change is complete thus allowing motion to turn the spindle back on and resume program execution.
@@ -50,10 +50,10 @@ Signifies that the tool change is complete.
5050
Pin to allow an external switch to signify that the tool change is complete.
5151
.SH USAGE
5252
Normal usage is to load the component in your HAL file and net the appropriate pins from the\fI motion\fR and\fI io\fR components.
53-
The following lines are typical in a HAL file when using the hal_manualtoolchange userspace component.
53+
The following lines are typical in a HAL file when using the hal_manualtoolchange non-realtime component.
5454
.TP
5555
.B loadusr \-W hal_manualtoolchange
56-
This will load the hal_manualtoolchange userspace component waiting for the component to be ready before continuing.
56+
This will load the hal_manualtoolchange non-realtime component waiting for the component to be ready before continuing.
5757
.TP
5858
.B net tool\-change iocontrol.0.tool\-change => hal_manualtoolchange.change
5959
When an M6 code is run, motion sets \fI iocontrol.0.tool\-change \fR to high indicating a tool change.

docs/man/man1/halcmd.1

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Anything following '\fB#\fR' on a line is a comment.
101101
module called \fImodname\fR. \fBhalcmd\fR looks for the module
102102
in a directory specified at compile time.
103103

104-
In systems with realtime-support, \fBhalcmd\fR calls the
104+
In systems with kernel-based realtime support (e.g. RTAI), \fBhalcmd\fR calls the
105105
\fBlinuxcnc_module_helper\fR to load realtime modules.
106106
\fBlinuxcnc_module_helper\fR is a setuid program and is compiled with
107107
a whitelist of modules it is allowed to load. This is currently
@@ -112,10 +112,11 @@ restrict which users can load these \fBLinuxCNC\fR-related kernel
112112
modules can do this by setting the permissions and group on
113113
\fBlinuxcnc_module_helper\fR appropriately.
114114

115-
In systems without realtime-support \fBhalcmd\fR calls the
116-
\fBrtapi_app\fR which creates the simulated realtime environment
117-
if it did not yet exist, and then loads the requested component
118-
with a call to \fBdlopen(3)\fR.
115+
In systems with userspace-based realtime support (e.g. Preempt-RT) and in
116+
systems without realtime support \fBhalcmd\fR calls the \fBrtapi_app\fR
117+
which creates the realtime environment (simulated realtime, on systems
118+
with no userspace realtime support) if it did not yet exist, and then
119+
loads the requested component with a call to \fBdlopen(3)\fR.
119120
.TP
120121
\fBunloadrt\fR \fImodname\fR
121122
(\fIunload\fR \fIr\fReal\fIt\fRime module) Unloads a realtime HAL
@@ -126,7 +127,7 @@ also works by execing \fBlinuxcnc_module_helper\fR or \fBrtapi_app\fR, just like
126127
.TP
127128
\fBloadusr\fR \fI[flags]\fR \fIunix-command\fR
128129
(\fIload\fR \fIUs\fRe\fIr\fRspace component) Executes the given
129-
\fIunix-command\fR, usually to load a userspace component.
130+
\fIunix-command\fR, usually to load a non-realtime component.
130131
\fI[flags]\fR may be one or more of:
131132
.RS
132133
.IP \(bu 4
@@ -142,21 +143,21 @@ name.
142143
.RE
143144
.TP
144145
\fBwaitusr\fR \fIname\fR
145-
(\fIwait\fR for \fIUs\fRe\fIr\fRspace component) Waits for user
146-
space component \fIname\fR to disconnect from HAL (usually on exit).
146+
(\fIwait\fR for \fIUs\fRe\fIr\fRspace component) Waits for non-realtime
147+
component \fIname\fR to disconnect from HAL (usually on exit).
147148
The component must already be loaded. Useful near the end of a
148149
HAL file to wait until the user closes some user interface component
149150
before cleaning up and exiting.
150151
.TP
151152
\fBunloadusr\fR \fIcompname\fR
152-
(\fIunload\fR \fIUs\fRe\fIr\fRspace component) Unloads a userspace
153+
(\fIunload\fR \fIUs\fRe\fIr\fRspace component) Unloads a non-realtime
153154
component called \fIcompname\fR. If \fIcompname\fR is "all", it will
154-
unload all userspace components. \fBunloadusr\fR
155-
works by sending SIGTERM to all userspace components.
155+
unload all non-realtime components. \fBunloadusr\fR
156+
works by sending SIGTERM to all non-realtime components.
156157
.TP
157158
\fBunload\fR \fIcompname\fR
158-
Unloads a userspace component or realtime module. If \fIcompname\fR is "all",
159-
it will unload all userspace components and realtime modules.
159+
Unloads a non-realtime component or realtime module. If \fIcompname\fR is "all",
160+
it will unload all non-realtime components and realtime modules.
160161
.TP
161162
\fBnewsig\fR \fIsigname\fR \fItype\fR
162163
(OBSOLETE - use \fBnet\fR instead) (\fInew\fR \fIsig\fRnal)

docs/man/man1/halcompile.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ to set the maximum of personality items to 4:
6161
.IP \(bu 4
6262
Compile \fB.comp\fR and \fB.c\fR files into \fB.so\fR or \fB.ko\fR HAL realtime components (the \fB\-\-compile\fR flag)
6363
.IP \(bu 4
64-
Compile \fB.comp\fR and \fB.c\fR files into HAL userspace components (the \fB\-\-compile \-\-userspace\fR flag)
64+
Compile \fB.comp\fR and \fB.c\fR files into HAL non-realtime components (the \fB\-\-compile \-\-userspace\fR flag)
6565
.IP \(bu 4
6666
Preprocess \fB.comp\fR files into \fB.c\fR files (the \fB\-\-preprocess\fR flag)
6767
.IP \(bu 4
@@ -71,12 +71,12 @@ Display documentation from \fB.comp\fR files onscreen (the \fB\-\-view\-doc\fR f
7171
.IP \(bu 4
7272
Compile and install \fB.comp\fR and \fB.c\fR files into the proper directory for HAL realtime components (the \fB\-\-install\fR flag), which may require \fIsudo\fR to write to system directories.
7373
.IP \(bu 4
74-
Install \fB.c\fR and \fB.py\fR files into the proper directory for HAL userspace components (the \fB\-\-install \-\-userspace\fR flag), which may require \fIsudo\fR to write to system directories.
74+
Install \fB.c\fR and \fB.py\fR files into the proper directory for HAL non-realtime components (the \fB\-\-install \-\-userspace\fR flag), which may require \fIsudo\fR to write to system directories.
7575
.IP \(bu 4
7676
Extract documentation from \fB.comp\fR files into \fB.9\fR manpage files in the proper system directory (the \fB\-\-install\fR flag), which may require \fIsudo\fR to write to system directories.
7777
.IP \(bu 4
7878
Preprocess \fB.comp\fR files into \fB.c\fR files (the \fB\-\-preprocess\fR flag)
7979
.SH "SEE ALSO"
8080
\fIHalcompile HAL Component Generator\fR in the LinuxCNC documentation for a full description of the \fB.comp\fR syntax, along with examples
8181

82-
\fBpydoc, HAL\fR and \fICreating Userspace Python Components\fR in the LinuxCNC documentation for documentation on the Python interface to HAL components
82+
\fBpydoc, HAL\fR and \fICreating Non-realtime Python Components\fR in the LinuxCNC documentation for documentation on the Python interface to HAL components

docs/man/man1/halsampler.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ are used together to sample HAL data in real time and store it in a file.
3939
is a realtime HAL component that exports HAL pins and creates a FIFO in shared memory.
4040
It then begins sampling data from the HAL and storing it to the FIFO.
4141
.B halsampler
42-
is a user space program that copies data from the FIFO to stdout, where it can
42+
is a non-realtime program that copies data from the FIFO to stdout, where it can
4343
be redirected to a file or piped to some other program.
4444

4545
.SH OPTIONS

docs/man/man1/hy_vfd.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
.TH hy_vfd "1" "April 25, 2015" "Huanyang VFD" "LinuxCNC Documentation"
2626

2727
.SH NAME
28-
\fBhy_vfd\fR \- HAL userspace component for Huanyang VFDs
28+
\fBhy_vfd\fR \- HAL non-realtime component for Huanyang VFDs
2929

3030
.SH SYNOPSIS
3131
.B hy_vfd

docs/man/man1/io.1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.TH "IOCONTROL - IO" "1" "2007-08-25" "LinuxCNC Documentation" "HAL Component"
22

33
.SH NAME
4-
iocontrol \- interacts with HAL or G-code in userspace
4+
iocontrol \- interacts with HAL or G-code in non-realtime
55

66
.SH SYNOPSIS
77

@@ -12,12 +12,12 @@ iocontrol \- interacts with HAL or G-code in userspace
1212
.SH DESCRIPTION
1313

1414
I/O control handles I/O tasks like coolant, toolchange, E-stop and lube.
15-
The signals are turned on and off in userspace with G-code or in the case of E-stop in HAL.
15+
The signals are turned on and off in non-realtime with G-code or in the case of E-stop in HAL.
1616

17-
The following pins are created by the userspace IO controller, usually found in $LINUXCNC_HOME/bin/io
17+
The following pins are created by the non-realtime IO controller, usually found in $LINUXCNC_HOME/bin/io
1818
.P
19-
iocontrol is a userspace process - if you have strict timing requirements
20-
or simply need more I/O, consider using the realtime synchronized I/oO
19+
iocontrol is a non-realtime process - if you have strict timing requirements
20+
or simply need more I/O, consider using the realtime synchronized I/O
2121
provided by \fBmotion\fR(9) instead.
2222
.P
2323
The INI file is searched for in the directory from which halcmd was run,

0 commit comments

Comments
 (0)