Skip to content

Commit d36be38

Browse files
authored
Merge pull request #1796 from smoe/docs_stupid_simple_stuff
More translation-triggered changes
2 parents 1312023 + c9c80be commit d36be38

7 files changed

Lines changed: 47 additions & 48 deletions

File tree

docs/src/drivers/gm.adoc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ gm.0.gpio.0.in-0
8989
----
9090

9191
indicates the state of the first pin of the first GPIO
92-
connector on the GM6-PCI card. Hal pins are updated by function
92+
connector on the GM6-PCI card. HAL pins are updated by function
9393

9494
----
9595
gm.<nr of card>.read
@@ -180,7 +180,7 @@ gm.0.encoder.0.position
180180
refers to the position of encoder module of axis 0.
181181

182182
The GM6-PCI card counts the encoder signal independently from LinuxCNC.
183-
Hal pins are updated by function:
183+
HAL pins are updated by function:
184184

185185
----
186186
gm.<nr of card>.read
@@ -197,7 +197,7 @@ gm.<nr of card>.read
197197
| .index-enabled | (bit, IO) | When True, counts and position are rounded or reset
198198
(depends on index-mode) on next rising edge of channel-I.
199199
Every time position is reset because of Index, index-enabled
200-
pin is set to 0 and remain 0 until connected hal pin does
200+
pin is set to 0 and remain 0 until connected HAL pin does
201201
not set it.
202202
| .velocity | (float, Out) | Velocity in scaled units per second. GM encoder uses high
203203
frequency hardware timer to measure time between encoder
@@ -262,14 +262,14 @@ Connect encoder position to LinuxCNC position feedback:
262262
net Xpos-fb gm.0.encoder.0.position => joint.0.motor-pos-fb
263263
----
264264

265-
=== Stepgen module
265+
=== StepGen module
266266

267-
The GM6-PCI motion control card has six stepgen modules, one for each joint.
267+
The GM6-PCI motion control card has six StepGen modules, one for each joint.
268268
Each module has two output signals. It can produce Step/Direction,
269-
Up/Down or Quadrature (A/B) pulses. Each stepgen module is connected
269+
Up/Down or Quadrature (A/B) pulses. Each StepGen module is connected
270270
to the pins of the corresponding RJ50 axis connector.
271271

272-
Every stepgen pin and parameter name begins as follows:
272+
Every StepGen pin and parameter name begins as follows:
273273

274274
----
275275
gm.<nr of card>.stepgen.<nr of axis>
@@ -281,10 +281,10 @@ where nr of axis is from 0 to 5. For example:
281281
gm.0.stepgen.0.position-cmd
282282
----
283283

284-
refers to the position command of stepgen module of axis 0 on card 0.
284+
refers to the position command of StepGen module of axis 0 on card 0.
285285

286286
The GM6-PCI card generates step pulses independently from LinuxCNC.
287-
Hal pins are updated by function
287+
HAL pins are updated by function
288288

289289
----
290290
gm.<nr of card>.write
@@ -309,10 +309,10 @@ gm.<nr of card>.write
309309
| Parameters | Type and Read/Write | Parameter description
310310
| .step-type | (u32, R/W) | When 0, module produces Step/Dir signal. When 1, it
311311
produces Up/Down step signals. And when it is 2, it
312-
produces quadrature output signals.
312+
produces quadrature output signals.
313313
| .control-type | (bit, R/W) | When True, .velocity-cmd is used as reference and velocity
314314
control calculate pulse rate output. When False, .position-cmd
315-
is used as reference and position control calculate pulse rate output.
315+
is used as reference and position control calculate pulse rate output.
316316
| .invert-step1 | (bit, R/W) | Invert the output of channel 1 (Step signal in StepDir mode)
317317
| .invert-step2 | (bit, R/W) | Invert the output of channel 2 (Dir signal in StepDir mode)
318318
| .maxvel | (float, R/W) | Maximum velocity in position units per second. If it is set to 0.0,
@@ -332,7 +332,7 @@ image::images/GM_RefSignals.png["Reference signal timing diagrams",align="center
332332

333333
.HAL example
334334

335-
Setting stepgen module of axis 0 to generate 1000 step pulse per position unit:
335+
Setting StepGen module of axis 0 to generate 1000 step pulse per position unit:
336336

337337
----
338338
setp gm.0.stepgen.0.step-type 0 # 0:stepDir, 1:UpDown, 2:Quad
@@ -349,7 +349,7 @@ setp gm.0.stepgen.0.stepspace1000 # 1000 ns = 1 us
349349
setp gm.0.stepgen.0.dirdelay 2000 # 2000 ns = 2 us
350350
----
351351

352-
Connect stepgen to axis 0 position reference and enable pins:
352+
Connect StepGen to axis 0 position reference and enable pins:
353353

354354
----
355355
net Xpos-cmd joint.0.motor-pos-cmd => gm.0.stepgen.0.position-cmd
@@ -362,7 +362,7 @@ The GM6-PCI motion control card has one enable output and one fault
362362
input HAL pins, both are connected to each RJ50 axis connector
363363
and to the CAN connector.
364364

365-
Hal pins are updated by function:
365+
HAL pins are updated by function:
366366

367367
----
368368
gm.<nr of card>.read
@@ -400,7 +400,7 @@ gm.0.dac.0.value
400400
----
401401

402402
refers to the output voltage of DAC module of axis 0.
403-
Hal pins are updated by function:
403+
HAL pins are updated by function:
404404

405405
----
406406
gm.<nr of card>.write
@@ -469,7 +469,7 @@ gm.0.can-gm.0.position
469469

470470
refers to the output position of axis 0 in position units.
471471

472-
Hal pins are updated by function:
472+
HAL pins are updated by function:
473473

474474
----
475475
gm.<nr of card>.write
@@ -566,7 +566,7 @@ gm.0.joint.0.home-sw-in
566566

567567
indicates the state of the axis 0 home switch.
568568

569-
Hal pins are updated by function:
569+
HAL pins are updated by function:
570570

571571
----
572572
gm.<nr of card>.read

docs/src/drivers/hostmot2.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ The above configuration produced this printout.
225225

226226
[NOTE]
227227
That the I/O Pin nnn will correspond to the pin number shown on
228-
the HAL Configuration screen for GPIOs. Some of the Stepgen, Encoder
228+
the HAL Configuration screen for GPIOs. Some of the StepGen, Encoder
229229
and PWMGen will also show up as GPIOs in the HAL Configuration screen.
230230

231231
== PIN Files
@@ -465,7 +465,7 @@ GPIO pins default to input.
465465

466466
== StepGen
467467

468-
Stepgens have names like 'hm2_<BoardType>.<BoardNum>.stepgen.<Instance>.'.
468+
StepGens have names like 'hm2_<BoardType>.<BoardNum>.stepgen.<Instance>'.
469469
'Instance' is a two-digit number that corresponds to the HostMot2 stepgen
470470
instance number.
471471
There are 'num_stepgens' instances, starting with 00.
@@ -475,13 +475,13 @@ time), but currently only uses two: Step and Direction outputs.
475475
footnote:[At present, the firmware supports multi-phase stepper outputs,
476476
but the driver doesn't. Interested volunteers are solicited.]
477477

478-
The stepgen representation is modeled on the stepgen software
479-
component. Stepgen default is active high step output (high during step
478+
The StepGen representation is modeled on the stepgen software
479+
component. StepGen default is active high step output (high during step
480480
time low during step space). To invert a StepGen output pin you invert
481481
the corresponding GPIO pin that is being used by StepGen. To find the
482482
GPIO pin being used for the StepGen output run 'dmesg' as shown above.
483483

484-
Each stepgen instance has the following pins and parameters:
484+
Each StepGen instance has the following pins and parameters:
485485

486486
=== Pins
487487

@@ -564,7 +564,7 @@ output run 'dmesg' as described above.
564564
== PWMGen
565565

566566
PWMgens have names like
567-
'hm2_<BoardType>.<BoardNum>.pwmgen.<Instance>.'. 'Instance' is a
567+
'hm2_<BoardType>.<BoardNum>.pwmgen.<Instance>'. 'Instance' is a
568568
two-digit number that corresponds to the HostMot2 pwmgen instance
569569
number. There are 'num_pwmgens' instances, starting with 00.
570570

docs/src/drivers/shuttle.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ of the device (the order in which the driver found them), for example
7171
'<Prefix>.button-<ButtonNumber>' (bit out)::
7272
These pins are True (1) when the button is pressed.
7373
'<Prefix>.button-<ButtonNumber>-not' (bit out)::
74-
These pins have the inverse of the button state, so they're True
75-
(1) when the button is not pressed.
74+
These pins have the inverse of the button state, so they're True (1) when the button is not pressed.
7675
'<Prefix>.counts' (s32 out)::
7776
Accumulated counts from the jog wheel (the inner wheel).
7877
'<Prefix>.spring-wheel-s32' (s32 out)::

docs/src/drivers/vfs11.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ component vfs11_vfd, named spindle-vfd
3131

3232
== Command Line Options
3333

34-
'vfs11_vfd' is mostly configured through inifile options. The command
34+
'vfs11_vfd' is mostly configured through INI file options. The command
3535
line options are:
3636

3737
* '-n or --name <halname>' : set the HAL component name
38-
* '-I or --ini <inifilename>' : take configuration from this ini file.
38+
* '-I or --ini <inifilename>' : take configuration from this INI file.
3939
Defaults to environment variable INI_FILE_NAME.
4040
* '-S or --section <section name>' : take configuration from this
41-
section in the ini file. Defaults to 'VFS11'.
41+
section in the INI file. Defaults to 'VFS11'.
4242
* '-d or --debug' enable debug messages on console output.
4343
* '-m or --modbus-debug' enable modbus messages on console output
4444
* '-r or --report-device' report device properties on console at startup
@@ -81,7 +81,7 @@ option.
8181
put the VFD into emergency-stopped status. No operation possible until
8282
cleared with err-reset or powercycling.
8383
* '<n>.frequency-command' (float, out)
84-
current target frequency in HZ as set through speed-command (which is
84+
current target frequency in Hz as set through speed-command (which is
8585
in RPM), from the VFD
8686
* '<n>.frequency-out' (float, out)
8787
current output frequency of the VFD
@@ -222,7 +222,7 @@ TARGET=1
222222
# for RECONNECT_DELAY seconds
223223
RECONNECT_DELAY=1
224224
225-
# misc flags
225+
# misc. parameters
226226
DEBUG=10
227227
MODBUS_DEBUG=0
228228
POLLCYCLES=10
@@ -338,7 +338,7 @@ The Ubuntu +libmodbus5+ and +libmodbus-dev+ packages are
338338
only available starting from Ubuntu 12 ('Precise Pengolin'). Moreover,
339339
these packages lack support for the MODBUS_RTS_MODE_*
340340
flags. Therefore, building vfs11_vfd using this library might generate
341-
a warning if RTS_MODE= is specified in the ini file.
341+
a warning if RTS_MODE= is specified in the INI file.
342342

343343
To use the full functionality on lucid and precise:
344344

@@ -348,7 +348,7 @@ To use the full functionality on lucid and precise:
348348
https://github.com/stephane/libmodbus/blob/master/README.rst[here].
349349

350350
Libmodbus does not build on Ubuntu Hardy, hence vfs11_vfd is not
351-
available on hardy.
351+
available on Hardy.
352352

353353
// Michael Haberler; loosely based on gs2_vfd by Steve Padnos and John Thornton.
354354

docs/src/examples/gs2-example.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GS2 VFD to drive a spindle.
1111
The spindle speed and direction is controlled by LinuxCNC.
1212

1313
Using the GS2 component involves very little to set up. We start with
14-
a Stepconf Wizard generated config. Make sure the pins with "Spindle
14+
a StepConf Wizard generated config. Make sure the pins with "Spindle
1515
CW" and "Spindle PWM" are set to unused in the parallel port setup
1616
screen.
1717

@@ -48,15 +48,15 @@ based on your physical requirements but these are beyond the scope of
4848
this manual. Refer to the GS2 manual that came with the drive for more
4949
information on the drive parameters.
5050

51-
* The communications switches must be set to RS-232C
52-
* The motor parameters must be set to match the motor
51+
* The communications switches must be set to RS-232C.
52+
* The motor parameters must be set to match the motor.
5353
* P3.00 (Source of Operation Command) must be set to Operation
54-
determined by RS-485 interface, 03 or 04
54+
determined by RS-485 interface, 03 or 04.
5555
* P4.00 (Source of Frequency Command) must be set to Frequency
56-
determined by RS232C/RS485 communication interface, 05
57-
* P9.01 (Transmission Speed) must be set to 9600 baud, 01
56+
determined by RS232C/RS485 communication interface, 05.
57+
* P9.01 (Transmission Speed) must be set to 9600 baud, 01.
5858
* P9.02 (Communication Protocol) must be set to "Modbus RTU mode,
59-
8 data bits, no parity, 2 stop bits", 03
59+
8 data bits, no parity, 2 stop bits", 03.
6060

6161
A PyVCP panel based on this example is <<gs2-rpm-meter,here>>.
6262

docs/src/gcode/g-code.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ rapid rate (or slower). 'G0' is typically used as a positioning move.
142142

143143
=== Rapid Velocity Rate
144144

145-
The MAX_VELOCITY setting in the ini file [TRAJ] section defines the
145+
The MAX_VELOCITY setting in the INI file [TRAJ] section defines the
146146
maximumrapid traverse rate. The maximum rapid traverse rate can be
147147
higher than the individual axes MAX_VELOCITY setting during a
148148
coordinated move. The maximum rapid traverse rate can be slower than the
@@ -964,7 +964,7 @@ It is a good idea to include a plane selection in the preamble
964964
of each G-code file.
965965

966966
The effects of having a plane selected are discussed in Section
967-
<<gcode:g2-g3,G2 G3 Arcs>> and Section <<gcode:g80-g89,G81 G89>>
967+
<<gcode:g2-g3,G2 G3 Arcs>> and Section <<gcode:g80-g89,G81 G89>>.
968968

969969
[[gcode:g20-g21]]
970970
== G20, G21 Units(((G20 Units)))
@@ -985,7 +985,7 @@ desired G28 position has been stored with G28.1.
985985
G28 uses the values stored in <<sub:numbered-parameters,parameters>>
986986
5161-5169 as the X Y Z A B C U V W final point to move to. The parameter
987987
values are 'absolute' machine coordinates in the native machine 'units'
988-
as specified in the ini file. All axes defined in the ini file will be
988+
as specified in the INI file. All axes defined in the INI file will be
989989
moved when a G28 is issued. If no positions are stored with G28.1 then
990990
all axes will go to the <<sec:machine-coordinate-system,machine origin>>.
991991

@@ -1019,14 +1019,14 @@ desired G30 position has been stored with G30.1.
10191019
G30 functions the same as G28 but uses the values stored in
10201020
<<sub:numbered-parameters,parameters>> 5181-5189 as the X Y Z A B C U V
10211021
W final point to move to. The parameter values are 'absolute' machine
1022-
coordinates in the native machine 'units' as specified in the ini file.
1023-
All axes defined in the ini file will be moved when a G30 is issued. If
1022+
coordinates in the native machine 'units' as specified in the INI file.
1023+
All axes defined in the INI file will be moved when a G30 is issued. If
10241024
no positions are stored with G30.1 then all axes will go to the
10251025
<<sec:machine-coordinate-system,machine origin>>.
10261026

10271027
[NOTE]
10281028
G30 parameters will be used to move the tool when a M6 is programmed
1029-
if TOOL_CHANGE_AT_G30=1 is in the [EMCIO] section of the ini file.
1029+
if TOOL_CHANGE_AT_G30=1 is in the [EMCIO] section of the INI file.
10301030

10311031
* 'G30' - makes a <<gcode:g0,rapid move>> from the current
10321032
position to the 'absolute' position of the values in parameters
@@ -2576,8 +2576,8 @@ becomes the specified value. All of the coordinate system's origins
25762576
'G92' uses the values stored in <<sub:numbered-parameters,parameters>>
25772577
5211-5219 as the X Y Z A B C U V W offset values for each axis.
25782578
The parameter values are 'absolute' machine coordinates
2579-
in the native machine 'units' as specified in the ini file.
2580-
All axes defined in the ini file will be offset when G92 is active.
2579+
in the native machine 'units' as specified in the INI file.
2580+
All axes defined in the INI file will be offset when G92 is active.
25812581
If an axis was not entered following the G92, that axis' offset
25822582
will be zero.
25832583

docs/src/gui/pyvcp-examples.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ net my-jogspeed halui.axis.jog-speed <= pyvcp.jog-speed-f
199199

200200
After resetting the E-Stop and putting it into jog mode and moving the
201201
jog speed slider in the PyVCP panel to a value greater than zero the
202-
PyVCP jog buttons should work. You can not jog when running a g code
202+
PyVCP jog buttons should work. You can not jog when running a G-code
203203
file or while paused or while the MDI tab is selected.
204204

205205
== Port Tester

0 commit comments

Comments
 (0)