Skip to content

Commit 3a6bb1f

Browse files
committed
More changes performed while translating
1 parent bb7ecf0 commit 3a6bb1f

9 files changed

Lines changed: 37 additions & 38 deletions

File tree

docs/src/hal/basic-hal.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ pin works not how it is handled in HAL.
162162

163163
A pin can be connected to a signal if it obeys the following rules:
164164

165-
* An IN pin can always be connected to a signal
166-
* An IO pin can be connected unless there's an OUT pin on the signal
165+
* An IN pin can always be connected to a signal.
166+
* An IO pin can be connected unless there's an OUT pin on the signal.
167167
* An OUT pin can be connected only if there are no other OUT or IO pins
168-
on the signal
168+
on the signal.
169169

170170
The same 'signal-name' can be used in multiple net commands to connect
171171
additional pins, as long as the rules above are obeyed.
@@ -319,7 +319,7 @@ A 'float' is a floating point number. In other words the decimal point
319319
can move as needed.
320320

321321
- float values = a 64 bit floating point value, with approximately 53 bits of
322-
resolution and over 1000 bits of dynamic range.
322+
resolution and over 2^10 (~ 1000) bits of dynamic range.
323323

324324
For more information on floating point numbers see:
325325

@@ -331,14 +331,14 @@ http://en.wikipedia.org/wiki/Floating_point[http://en.wikipedia.org/wiki/Floatin
331331
An 's32' number is a whole number that can have a negative or positive
332332
value.
333333

334-
- s32 values = integer numbers -2147483648 to 2147483647
334+
- s32 values = integer numbers from -2147483648 to 2147483647
335335

336336
[[sub:hal-u32]]
337337
=== u32(((HAL u32,u32)))
338338

339339
A 'u32' number is a whole number that is positive only.
340340

341-
- u32 values = integer numbers 0 to 4294967295
341+
- u32 values = integer numbers from 0 to 4294967295
342342

343343
[[sec:hal-files]]
344344
== HAL Files(((HAL Files)))
@@ -353,7 +353,7 @@ have up to three HAL files in your config directory.
353353
GUI is loaded.
354354
- 'custom_postgui.hal' This file is loaded after the GUI loads. This is
355355
where you put your custom HAL commands that you want loaded after the
356-
GUI is loaded. Any HAL commands that use pyVCP widgets need to be
356+
GUI is loaded. Any HAL commands that use PyVCP widgets need to be
357357
placed here.
358358

359359
[[sec:hal-parameters]]

docs/src/hal/canonical-devices.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ of values. Examples are digital to analog converters or PWM generators.
108108
=== Parameters(((HAL Analog Output Parameters)))
109109

110110
(float) *offset*:: This will be added to the *value* before the
111-
hardware is updated
111+
hardware is updated.
112112
(float) *scale*:: This should be set so that an input of 1 on the
113113
*value* pin will cause the analog output pin to read 1 volt.
114114
(float) *high_limit* (optional):: When calculating the value to
@@ -118,7 +118,7 @@ of values. Examples are digital to analog converters or PWM generators.
118118
to the hardware, if *value* + *offset* is less than *low_limit*, then
119119
*low_limit* will be used instead.
120120
(float) *bit_weight* (optional):: The value of one least significant
121-
bit (LSB), in volts (or mA, for current outputs)
121+
bit (LSB), in volts (or mA, for current outputs).
122122
(float) *hw_offset* (optional):: The actual voltage (or current)
123123
that will be output if 0 is written to the hardware.
124124

docs/src/hal/comp.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ addf ddt.0 servo-thread
6767
----
6868

6969
More information on 'loadrt' and 'addf' can be found in the
70-
<<cha:basic-hal-reference,Hal Basics>>.
70+
<<cha:basic-hal-reference,HAL Basics>>.
7171

7272
To test your component you can follow the examples in the
7373
<<cha:hal-tutorial,HAL Tutorial>>.
@@ -307,8 +307,8 @@ parameters, and functions for `prefix`.
307307
in the automatically defined 'rtapi_app_main'.
308308

309309
* 'option userspace yes' - (default: no)
310-
If specified, this file describes a userspace (ie, non-realtime) component, rather
311-
than a regular (ie, realtime) one. A userspace component may not have functions
310+
If specified, this file describes a userspace (i.e., non-realtime) component, rather
311+
than a regular (i.e., realtime) one. A userspace component may not have functions
312312
defined by the 'function' directive. Instead, after all the
313313
instances are constructed, the C function `void user_mainloop(void);`
314314
is called. When this function returns, the component exits.
@@ -358,8 +358,8 @@ The result of using any other option is undefined. +
358358
license "GPL"; // indicates GPL v2 or later
359359
+
360360
For additional information on the meaning of MODULE_LICENSE() and
361-
additional license identifiers, see '<linux/module.h>'. or the manual page
362-
'rtapi_module_param(3)'
361+
additional license identifiers, see '<linux/module.h>' or the manual page
362+
'rtapi_module_param(3)'.
363363
+
364364
This declaration is *required*.
365365

@@ -456,7 +456,7 @@ when its 'condition' evaluated to a nonzero value.
456456
* 'variable_name' - For each variable 'variable_name' there is a macro which allows the
457457
name to be used on its own to refer
458458
to the variable. When 'variable_name' is an array, the normal C-style
459-
subscript is used: 'variable_name[idx]'
459+
subscript is used: 'variable_name[idx]'.
460460

461461
* 'data' - If "option data" is specified, this macro allows access to the
462462
instance data.
@@ -803,10 +803,10 @@ which creates the following pins:
803803
- 3-input AND and XOR gates: logic.2.and, logic.2.xor, logic.2.in-00,
804804
logic.2.in-01, logic.2.in-02
805805

806-
=== general functions
806+
=== General Functions
807807

808-
This example shows how to call functions from the main function. +
809-
it also shows how to pass reference of HAL pins to those functions. +
808+
This example shows how to call functions from the main function.
809+
It also shows how to pass reference of HAL pins to those functions.
810810

811811
[source,c]
812812
----
@@ -844,7 +844,7 @@ FUNCTION(_) {
844844
}
845845
----
846846

847-
This component uses two general function to manipulate a HAL bit pin referenced to it. +
847+
This component uses two general function to manipulate a HAL bit pin referenced to it.
848848

849849
== Command Line Usage
850850

docs/src/hal/components.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ deadzone:: (((deadzone))) Return the center if within the threshold.
124124

125125
hypot:: (((hypot))) Three-input hypotenuse (Euclidean distance) calculator.
126126

127-
mult2:: (((mult2))) Product of two inputs.
127+
mult2:: (((mult2))) Product of two inputs (multiplexing).
128128

129-
mux16:: (((mux16))) Select from one of sixteen input values.
129+
mux16:: (((mux16))) Select from one of sixteen input values (multiplexing).
130130

131-
mux2:: (((mux2))) Select from one of two input values.
131+
mux2:: (((mux2))) Select from one of two input values (multiplexing).
132132

133-
mux4:: (((mux4))) Select from one of four input values.
133+
mux4:: (((mux4))) Select from one of four input values (multiplexing).
134134

135-
mux8:: (((mux8))) Select from one of eight input values.
135+
mux8:: (((mux8))) Select from one of eight input values (multiplexing).
136136

137137
near:: (((near))) Determine whether two values are roughly equal.
138138

docs/src/hal/hal-examples.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ In this example it is assumed that you're 'rolling your own'
8080
configuration and wish to add the HAL Manual Toolchange window. The HAL
8181
Manual Toolchange is primarily useful if you have presettable tools and
8282
you store the offsets in the tool table. If you need to touch off for
83-
each tool change then it is best just to split up your g code. To use
83+
each tool change then it is best just to split up your G-code. To use
8484
the HAL Manual Toolchange window you basically have to load the
8585
hal_manualtoolchange component then send the iocontrol 'tool change' to
8686
the hal_manualtoolchange 'change' and send the hal_manualtoolchange

docs/src/hal/halshow.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ as focused as you need.
9191

9292
.[yellow-background]#New in 2.9#
9393
* Selected text from the Show tab can be copied by right-click or CTRL-C.
94-
* The command entry provides now a bash-like history (only for the session) for executed commands.
94+
* The command entry provides now a BASH-like history (only for the session) for executed commands.
9595

9696
If we take a closer look at the tree display we can see that the six
9797
major parts of a HAL can all be expanded at least one level. As these
@@ -136,7 +136,6 @@ to axis position so that we could see the rate of change in position, i.e.,
136136
acceleration. We first need to load a HAL component named ddt, add it to the
137137
servo thread, then connect it to the position pin of a joint. Once that is
138138
done we can find the output of the differentiator in halscope. So let's go.
139-
(Yes, I looked this one up.
140139

141140
[source,{hal}]
142141
----

docs/src/hal/intro.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ does - that is determined by which functions are
320320
connected to it. The real distinction is simply how often a thread
321321
runs.
322322

323-
In LinuxCNC you might have a 50 us thread and a 1 ms thread.
323+
In LinuxCNC you might have a 50 µs thread and a 1 ms thread.
324324
These would be created based on BASE_PERIOD and SERVO_PERIOD, the
325325
actual times depend on the values in your ini file.
326326

docs/src/hal/rtcomps.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ timing of the step and direction signals. In the following figure
144144
the meaning of these parameters is shown. The
145145
parameters are in nanoseconds, but will be rounded up to an integer
146146
multiple of the thread period for the threaed that calls
147-
'make_pulses()'. For example, if 'make_pulses()' is called every 16 us,
147+
'make_pulses()'. For example, if 'make_pulses()' is called every 16 µs,
148148
and steplen is 20000, then the step pulses will
149-
be 2 x 16 = 32 us long. The default value for all four of the parameters
149+
be 2 x 16 = 32 µs long. The default value for all four of the parameters
150150
is 1ns, but the automatic rounding takes effect the first time the code
151151
runs. Since one step requires 'steplen' ns high and 'stepspace' ns
152152
low, the maximum frequency is 1,000,000,000 divided by
@@ -210,7 +210,7 @@ threads is not supported.
210210
feedback, updates latches and scales position.
211211

212212
The high speed function 'stepgen.make-pulses' should be run in a very
213-
fast thread, from 10 to 50 us depending on the
213+
fast thread, from 10 to 50 µs depending on the
214214
capabilities of the computer. That thread's period determines the
215215
maximum step frequency, since 'steplen', 'stepspace', 'dirsetup',
216216
'dirhold', and 'dirdelay' are all rounded up to a integer multiple of
@@ -332,7 +332,7 @@ not supported.
332332

333333
* '(funct) pwmgen.make-pulses' - High speed function to generate PWM waveforms
334334
(no floating point). The high speed function 'pwmgen.make-pulses' should be
335-
run in the base (fastest) thread, from 10 to 50 us depending on the
335+
run in the base (fastest) thread, from 10 to 50 µs depending on the
336336
capabilities of the computer. That thread's period determines the maximum PWM
337337
carrier frequency, as well as the resolution of the PWM or PDM signals. If
338338
the base thread is 50,000nS then every 50uS the module decides if it is time
@@ -355,10 +355,10 @@ rates of 10kHz to perhaps up to 50kHz.
355355

356356
The base thread should be 1/2 count speed to allow for noise and timing
357357
variation. For example if you have a 100 pulse per revolution encoder on the
358-
spindle and your maximnum RPM is 3000 the maximum base thread should be 25 us.
358+
spindle and your maximnum RPM is 3000 the maximum base thread should be 25 µs.
359359
A 100 pulse per revolution encoder will have 400 counts. The spindle speed
360360
of 3000 RPM = 50 RPS (revolutions per second). 400 * 50 = 20,000 counts per
361-
second or 50 us between counts.
361+
second or 50 µs between counts.
362362

363363
The Encoder Counter Block Diagram is a block diagram of one channel of an
364364
encoder counter.

docs/src/hal/tutorial.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ should probably disappear.]
221221
To actually run the code contained in the function 'siggen.0.update',
222222
we need a realtime thread. The component called 'threads' that is used
223223
to create a new thread. Lets create a thread called 'test-thread' with
224-
a period of 1 ms (1,000 us or 1,000,000 ns):
224+
a period of 1 ms (1,000 µs or 1,000,000 ns):
225225

226226
----
227227
halcmd: loadrt threads name1=test-thread period1=1000000
@@ -892,7 +892,7 @@ left click on the samples box.
892892
image::images/halscope-01.png["Realtime function not linked dialog",align="center"]
893893

894894
This dialog is where you set the sampling rate for the oscilloscope.
895-
For now we want to sample once per millisecond, so click on the 989 us
895+
For now we want to sample once per millisecond, so click on the 989 µs
896896
thread 'slow' and leave the multiplier at 1. We will also leave the
897897
record length at 4000 samples, so that we can use up to four channels
898898
at one time. When you select a thread and then click 'OK', the dialog
@@ -1037,11 +1037,11 @@ position slider to determine which part of the zoomed waveform is
10371037
visible. However, sometimes simply expanding the waveforms isn't enough
10381038
and you need to increase the sampling rate. For example, we would like
10391039
to look at the actual step pulses that are being generated in our
1040-
example. Since the step pulses may be only 50 us long, sampling at 1KHz
1040+
example. Since the step pulses may be only 50 µs long, sampling at 1KHz
10411041
isn't fast enough. To change the sample rate, click on the button that
10421042
displays the number of samples and sample rate to bring up the 'Select
10431043
Sample Rate' dialog, figure . For this example, we will click on the
1044-
50 us thread, 'fast', which gives us a sample rate of about 20KHz. Now
1044+
50 µs thread, 'fast', which gives us a sample rate of about 20KHz. Now
10451045
instead of displaying about 4 seconds worth of data, one record is 4000
10461046
samples at 20KHz, or about 0.20 seconds.
10471047

0 commit comments

Comments
 (0)