Skip to content

Commit 4bb0d47

Browse files
committed
More changes triggered while translating.
1 parent 3bf8d57 commit 4bb0d47

6 files changed

Lines changed: 37 additions & 49 deletions

File tree

docs/src/config/pncconf.adoc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ search' button. This pops up the help output page with a list of all the PCI
149149
devices that can be found. In there should be a reference to a parallel port
150150
device with a list of addresses. One of those addresses should work. Not all
151151
PCI parallel ports work properly. Either type can be selected as 'in' (maximum
152-
amount of input pins) or 'out' (maximum amount of output pins)
152+
amount of input pins) or 'out' (maximum amount of output pins).
153153

154154
GUI Front-end list::
155155
This specifies the graphical display screens LinuxCNC will use.
@@ -337,7 +337,7 @@ Defaults and Options::
337337
this checkbox.
338338
* Popup Tool Prompt
339339
** Choose between an on screen prompt for tool changes or export standard signal
340-
names for a User supplied custom tool changer Hal file
340+
names for a User supplied custom tool changer HAL file
341341
* Leave spindle on during tool change:
342342
** Used for lathes
343343
* Force individual manual homing
@@ -824,15 +824,15 @@ The first selection is components that pncconf uses internally.
824824
You may configure pncconf to load extra instances of the components for your
825825
custom HAL file.
826826

827-
Select the number of instances your custom file will need, pncconf will add
827+
Select the number of instances your custom file will need, PnCconf will add
828828
what it needs after them.
829829

830-
Meaning if you need 2 and pncconf needs 1 pncconf will load 3 instances and use
830+
Meaning if you need 2 and PnCconf needs 1 PnCconf will load 3 instances and use
831831
the last one.
832832

833833
Custom Component Commands::
834834

835-
This selection will allow you to load HAL components that pncconf does not use.
835+
This selection will allow you to load HAL components that PnCconf does not use.
836836
Add the loadrt or loadusr command, under the heading 'loading command'
837837
Add the addf command under the heading 'Thread command'.
838838
The components will be added to the thread between reading of inputs and writing
@@ -887,7 +887,7 @@ have the option to move them around later.
887887

888888
Custom Signal Names::
889889

890-
The Hal Components page can be used to load components needed by a user for
890+
The HAL Components page can be used to load components needed by a user for
891891
customization.
892892

893893
Loading Custom Firmware::
@@ -900,8 +900,9 @@ to PnCconf's preference file. By default this path searches the desktop for
900900
a folder named custom_firmware and a file named firmware.py.
901901

902902
The hidden preference file is in the user's home file, is
903-
named .pncconf-preferences and require one to select 'show hidden files' to see
904-
and edit it. The contents of this file can be seen when you first load PnCconf -
903+
named .pncconf-preferences and require one to select 'show hidden files' in your
904+
file manager to see and edit it or on the command line you use 'ls' with the '-a' option.
905+
The contents of this file can be seen when you first load PnCconf -
905906
press the help button and look at the output page.
906907

907908
Ask on the LinuxCNC mail-list or forum for info about converting custom firmware.

docs/src/config/python-interface.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ machine angular units per deg, reflects [TRAJ]ANGULAR_UNITS INI value.
126126
currently executing command.
127127

128128
*current_line*:: '(returns integer)' -
129-
currently executing line, int.
129+
currently executing line.
130130

131131
*current_vel*:: '(returns float)' -
132132
current velocity in user units per second.

docs/src/config/stepconf.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ image::images/stepconf-base_en.png["Basic Information Page",align="center"]
7171
Otherwise, select 'Other' and find the timing values in your
7272
driver's data sheet and enter them as 'nano seconds' in the 'Driver Timing Settings'.
7373
If the data sheet gives a value in microseconds, multiply by 1000.
74-
For example, enter 4.5us as 4500ns.
74+
For example, enter 4.5 µs as 4500 ns.
7575
+
7676
A list of some popular drives, along with their timing values, is on the
7777
LinuxCNC.org Wiki under
@@ -152,7 +152,7 @@ with software stepping. If the max latency is more like 30-50
152152
microseconds, you can still get good results, but your maximum step
153153
rate might be a little disappointing, especially if you use
154154
microstepping or have very fine pitch leadscrews. If the numbers are
155-
100 us or more (100,000 nanoseconds), then the PC is not a good
155+
100 µs or more (100,000 nanoseconds), then the PC is not a good
156156
candidate for software stepping. Numbers over 1 millisecond (1,000,000
157157
nanoseconds) mean the PC is not a good candidate for LinuxCNC, regardless of
158158
whether you use software stepping or not.
@@ -231,7 +231,7 @@ image::images/stepconf-axis-x_en.png["Axis X Configuration Page",align="center"]
231231
Information computed based on the values entered above.
232232
The greatest 'Pulse rate at max speed' determines the 'BASE_PERIOD'.
233233
Values above 20000Hz may lead to slow response time or even lockups (the fastest usable pulse rate varies from computer to computer)
234-
* 'Axis SCALE' - The number that will be used in the ini file [SCALE] setting.
234+
* 'Axis SCALE' - The number that will be used in the INI file [SCALE] setting.
235235
This is how many steps per user unit.
236236
* 'Test this axis' - (((Test this axis)))
237237
This will open a window to allow testing for each axis. This can be used after filling out all the information for this axis.
@@ -375,8 +375,8 @@ For 'Speed' enter the measured speed, and for 'PWM' enter the S-number divided b
375375
Because most spindle drivers are somewhat nonlinear in their response
376376
curves, it is best to:
377377

378-
- Make sure the two calibration speeds are not too close together in RPM
379-
- Make sure the two calibration speeds are in the range of speeds you will typically use while milling
378+
- Make sure the two calibration speeds are not too close together in RPM.
379+
- Make sure the two calibration speeds are in the range of speeds you will typically use while milling.
380380

381381
For instance, if your spindle will go from 0 RPM to 8000 RPM,
382382
but you generally use speeds from 400 RPM (10%) to 4000 RPM (100%),
@@ -389,7 +389,7 @@ image::images/stepconf-options_en.png["Advanced Options Configuration",align="ce
389389

390390
* 'Include Halui' - This will add the Halui user interface component. See the
391391
<<cha:hal-user-interface,HALUI Chapter>> for more information on.
392-
* 'Include pyVCP' - This option adds the pyVCP panel base file or a sample file
392+
* 'Include PyVCP' - This option adds the PyVCP panel base file or a sample file
393393
to work on. See the <<cha:pyvcp,PyVCP Chapter>> for more information.
394394
* 'Include ClassicLadder PLC' - This option will add the ClassicLadder PLC
395395
(Programmable Logic Controller). See the

docs/src/drivers/hostmot2.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ The stepgen representation is modeled on the stepgen software
479479
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
482-
GPIO pin being used for the StepGen output run dmesg as shown above.
482+
GPIO pin being used for the StepGen output run 'dmesg' as shown above.
483483

484484
Each stepgen instance has the following pins and parameters:
485485

@@ -542,7 +542,7 @@ Each stepgen instance has the following pins and parameters:
542542

543543
The Step and Direction pins of each StepGen have two additional
544544
parameters. To find which I/O pin belongs to which step and direction
545-
output run dmesg as described above.
545+
output run 'dmesg' as described above.
546546

547547
* 'invert_output' - (Bit, RW) This parameter only has an effect if the
548548
'is_output' parameter is true.
@@ -571,7 +571,7 @@ number. There are 'num_pwmgens' instances, starting with 00.
571571
In HM2, each pwmgen uses three output I/O pins: Not-Enable, Out0, and
572572
Out1. To invert a PWMGen output pin you invert the corresponding GPIO
573573
pin that is being used by PWMGen. To find the GPIO pin being used for
574-
the PWMGen output run dmesg as shown above.
574+
the PWMGen output run 'dmesg' as shown above.
575575

576576
The function of the Out0 and Out1 I/O pins varies with output-type
577577
parameter (see below).
@@ -639,7 +639,7 @@ component. Each pwmgen instance has the following pins and parameters:
639639
=== Output Parameters
640640

641641
The output pins of each PWMGen have two additional parameters. To find
642-
which I/O pin belongs to which output run dmesg as described above.
642+
which I/O pin belongs to which output run 'dmesg' as described above.
643643

644644
* 'invert_output' - (Bit, RW) This parameter only has an effect if the
645645
'is_output' parameter is true. If this parameter is true, the output
@@ -822,7 +822,7 @@ load. The examples are a good place to start and will save you time.
822822
Just pick the proper example from the LinuxCNC Configuration Selector and
823823
save a copy to your computer so you can edit it. To see the exact pins
824824
and parameters that your configuration gave you, open the Show HAL
825-
Configuration window from the Machine menu, or do dmesg as outlined
825+
Configuration window from the Machine menu, or do 'dmesg' as outlined
826826
above.
827827

828828
// vim: set syntax=asciidoc:

docs/src/drivers/mb2hal.adoc

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ device:
2323
. Now there is a third option that consists of a "generic" driver
2424
configured by text file, this is called MB2HAL.
2525

26-
Why MB2HAL ?
26+
Why MB2HAL?
2727
Consider using Mb2hal if:
2828

2929
* You have to write a new driver and you don't know anything about
@@ -108,7 +108,7 @@ One of: even, odd, none. Ignored if `LINK_TYPE=tcp`.
108108
|`SERIAL_STOP` | Integer | If `LINK_TYPE=serial` | Stop bits.
109109
One of 1, 2. Ignored if `LINK_TYPE=tcp`.
110110
|`SERIAL_DELAY_MS`| Integer | If `LINK_TYPE=serial` | Serial port delay
111-
in ms between transactions of this section only.
111+
between transactions of this section only.
112112
In ms. Defaults to 0. Ignored if `LINK_TYPE=tcp`.
113113
|`MB_SLAVE_ID` | Integer | Yes | Modbus slave number.
114114
|`FIRST_ELEMENT` | Integer | Yes | The first element address.
@@ -164,32 +164,18 @@ correspond to:
164164

165165
Modbus protocol exceptions:
166166

167-
* 0x01 - ILLEGAL_FUNCTION - the FUNCTION code received in the
168-
query is not allowed or invalid.
169-
* 0x02 - ILLEGAL_DATA_ADDRESS - the DATA ADDRESS received in the
170-
query is not an allowable address for
171-
the slave or is invalid.
172-
* 0x03 - ILLEGAL_DATA_VALUE - a VALUE contained in the data query
173-
field is not an allowable value or is
174-
invalid.
175-
* 0x04 - SLAVE_DEVICE_FAILURE - SLAVE (or MASTER) device unrecoverable
176-
FAILURE while attempting to perform
177-
the requested action.
167+
* 0x01 - ILLEGAL_FUNCTION - the FUNCTION code received in the query is not allowed or invalid.
168+
* 0x02 - ILLEGAL_DATA_ADDRESS - the DATA ADDRESS received in the query is not an allowable address for the slave or is invalid.
169+
* 0x03 - ILLEGAL_DATA_VALUE - a VALUE contained in the data query field is not an allowable value or is invalid.
170+
* 0x04 - SLAVE_DEVICE_FAILURE - SLAVE (or MASTER) device unrecoverable FAILURE while attempting to perform the requested action.
178171
* 0x04 - SERVER_FAILURE - (see above).
179-
* 0x05 - ACKNOWLEDGE - This response is returned to
180-
PREVENT A TIMEOUT in the master.
181-
A long duration of time is required
182-
to process the request in the slave.
183-
* 0x06 - SLAVE_DEVICE_BUSY - The slave (or server) is BUSY.
184-
Retransmit the request later.
172+
* 0x05 - ACKNOWLEDGE - This response is returned to PREVENT A TIMEOUT in the master. A long duration of time is required to process the request in the slave.
173+
* 0x06 - SLAVE_DEVICE_BUSY - The slave (or server) is BUSY. Retransmit the request later.
185174
* 0x06 - SERVER_BUSY - (see above).
186-
* 0x07 - NEGATIVE_ACKNOWLEDGE - Unsuccessful programming request
187-
using function code 13 or 14.
175+
* 0x07 - NEGATIVE_ACKNOWLEDGE - Unsuccessful programming request using function code 13 or 14.
188176
* 0x08 - MEMORY_PARITY_ERROR - SLAVE parity error in MEMORY.
189177
* 0x0A (-10) - GATEWAY_PROBLEM_PATH - Gateway path(s) not available.
190-
* 0x0B (-11) - GATEWAY_PROBLEM_TARGET - The target device failed to
191-
respond (generated by master,
192-
not slave).
178+
* 0x0B (-11) - GATEWAY_PROBLEM_TARGET - The target device failed to respond (generated by master, not slave).
193179

194180
Program or connection:
195181

docs/src/drivers/opto22.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,14 @@ designating it as a HEX number).
140140

141141
Another example: To set the port for 8 outputs and 16 inputs (the
142142
same as a Mesa card). Here is the 24 bits represented in a BINARY
143-
number. Bit 1 is the rightmost number.
143+
number. Bit 1 is the rightmost number:
144144

145-
000000000000000011111111
146-
147-
16 zeros for the 16 inputs and 8 ones for the 8 outputs
145+
.16 zeros for the 16 inputs and 8 ones for the 8 outputs
146+
----
147+
000000000000000011111111
148+
----
148149

149-
Which converts to FF on the calculator so 0xff is the number to use
150+
This converts to FF on the calculator, so 0xff is the number to use
150151
for portconfig0 and/or portconfig1 when loading the driver.
151152

152153
== Pin Numbering

0 commit comments

Comments
 (0)