Skip to content

Commit 4067a09

Browse files
authored
Merge pull request #3533 from LinuxCNC/docs_fixes_20250803
docs: optics while translating (smoe:docs_fixes_20250803)
2 parents 2e4c56f + 0c4d1d7 commit 4067a09

23 files changed

Lines changed: 288 additions & 366 deletions

docs/src/config/core-components.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ unlock_joints_mask=0x38 selects joints 3,4,5
9393
----
9494

9595
[[sec:motion-pins]]
96-
=== Pins(((motion (HAL pins))))
96+
=== Pins(((motion:HAL pins)))
9797

9898
These pins, parameters, and functions are created by the realtime 'motmod'
9999
module.

docs/src/config/python-interface.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The general pattern for `linuxcnc` usage is roughly like this:
4040
- Establish connections to the command, status and error NML channels as needed.
4141
- Poll the status channel, either periodically or as needed.
4242
- Before sending a command, determine from status whether it is in fact OK to do so
43-
(for instance, there is no point in sending a 'Run' command if task is in the ESTOP state, or the interpreter is not idle)
43+
(for instance, there is no point in sending a 'Run' command if task is in the ESTOP state, or the interpreter is not idle).
4444
- Send the command by using one of the `linuxcnc` command channel methods.
4545

4646
To retrieve messages from the error channel, poll the error channel periodically, and process any messages retrieved.

docs/src/drivers/hal_pi_gpio.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,23 @@ Depending on the dir and exclude masks.
6969

7070
== Parameters
7171

72-
Only the standard timing parameters which are created for all components exist.
72+
Only the standard timing parameters which are created for all components exist:
7373

74-
*hal_pi_gpio.read.tmax
75-
*hal_pi_gpio.read.tmax-increased
76-
*hal_pi_gpio.write.tmax
77-
*hal_pi_gpio.write.tmax-increased
74+
* hal_pi_gpio.read.tmax
75+
* hal_pi_gpio.read.tmax-increased
76+
* hal_pi_gpio.write.tmax
77+
* hal_pi_gpio.write.tmax-increased
7878

79-
For unknown reasons the driver also creates HAL _pins_ to indicate timing
79+
For unknown reasons the driver also creates HAL _pins_ to indicate timing:
8080

81-
*hal_pi_gpio.read.time
82-
*hal_pi_gpio.write.time
81+
* hal_pi_gpio.read.time
82+
* hal_pi_gpio.write.time
8383

8484

8585
== Functions
8686

87-
* 'hal_pi_gpio.read' - Add this to the base thread to update the HAL pin values to match the physical input values.
88-
* 'hal_pi_gpio.write' - Add this to the base thread to update the physical pins to match the HAL values.
87+
* `hal_pi_gpio.read` - Add this to the base thread to update the HAL pin values to match the physical input values.
88+
* `hal_pi_gpio.write` - Add this to the base thread to update the physical pins to match the HAL values.
8989

9090
Typically the 'read' function will be early in the call list, before any encoder counters and the 'write' function will be later in the call list, after stepgen.make-pulses.
9191

docs/src/gcode/coordinates.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,15 @@ would still be in effect.
150150

151151
[source,{ngc}]
152152
----
153-
G54 uses parameters of coordinate system 1(((G54)))
154-
G55 uses parameters of coordinate system 2(((G55)))
155-
G56 uses parameters of coordinate system 3(((G56)))
156-
G57 uses parameters of coordinate system 4(((G57)))
157-
G58 uses parameters of coordinate system 5(((G58)))
158-
G59 uses parameters of coordinate system 6(((G59)))
159-
G59.1 uses parameters of coordinate system 7(((G59.1)))
160-
G59.2 uses parameters of coordinate system 8(((G59.2)))
161-
G59.3 uses parameters of coordinate system 9(((G59.3)))
153+
G54 uses parameters of coordinate system 1
154+
G55 uses parameters of coordinate system 2
155+
G56 uses parameters of coordinate system 3
156+
G57 uses parameters of coordinate system 4
157+
G58 uses parameters of coordinate system 5
158+
G59 uses parameters of coordinate system 6
159+
G59.1 uses parameters of coordinate system 7
160+
G59.2 uses parameters of coordinate system 8
161+
G59.3 uses parameters of coordinate system 9
162162
----
163163

164164
=== Default Coordinate System

docs/src/gcode/g-code.adoc

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ It is an error if:
11831183
due to the spindle speed
11841184

11851185
[[gcode:g38]]
1186-
== G38.n Straight Probe(((G38.n Probe)))
1186+
== G38._n_ Straight Probe(((G38.n Probe)))
11871187

11881188
[source,{ngc}]
11891189
----
@@ -1202,11 +1202,11 @@ You will not be able to use a probe move until your machine has been set
12021202
up to provide a probe input signal.
12031203
The probe input signal must be connected to 'motion.probe-input' in a .hal
12041204
file.
1205-
G38.n uses motion.probe-input to determine when the probe has made (or
1205+
G38._n_ uses motion.probe-input to determine when the probe has made (or
12061206
lost) contact.
12071207
TRUE for probe contact closed (touching), FALSE for probe contact open.
12081208

1209-
Program 'G38.n axes' to perform a straight probe operation.
1209+
Program 'G38._n_ axes' to perform a straight probe operation.
12101210
The axis words are optional, except that at least one of them must be
12111211
used.
12121212
The axis words together define the destination point that the probe will
@@ -1405,10 +1405,9 @@ G43 <H->
14051405
a compensated axis is moved, that axis's endpoint is the compensated
14061406
location.
14071407

1408-
'G43' without an H word uses the currently loaded tool from the last
1409-
'Tn M6'.
1408+
'G43' without an H word uses the currently loaded tool from the last 'T__n__ M6'.
14101409

1411-
'G43 Hn' uses the offset for tool n.
1410+
'G43 H__n__' uses the offset for tool _n_.
14121411

14131412
The active tool length compensation values are stored in the numbered
14141413
parameters '5401-5409'.
@@ -1445,10 +1444,9 @@ It is an error if:
14451444
G43.1 axes
14461445
----
14471446

1448-
* 'G43.1 axes' - change subsequent motions by replacing the current
1449-
offset(s) of axes.
1450-
G43.1 does not cause any motion. The next time a compensated axis
1451-
is moved, that axis's endpoint is the compensated location.
1447+
* 'G43.1 axes' - change subsequent motions by replacing the current offset(s) of axes.
1448+
G43.1 does not cause any motion. The next time a compensated axis is moved,
1449+
that axis's endpoint is the compensated location.
14521450

14531451
.G43.1 Example
14541452
[source,{ngc}]
@@ -1459,8 +1457,7 @@ G43.1 Z0.250 (replace current tool offset with 0.250, DRO now shows Z0.250)
14591457
M2 (end program)
14601458
----
14611459

1462-
* See <<gcode:g90-g91,G90>> & <<sec:select-tool,T>> & <<mcode:m6,M6>>
1463-
sections for more information.
1460+
* See <<gcode:g90-g91,G90>> & <<sec:select-tool,T>> & <<mcode:m6,M6>> sections for more information.
14641461

14651462
It is an error if:
14661463

@@ -1479,11 +1476,11 @@ G43.2 H- or axes-
14791476

14801477
* 'H' - tool number
14811478

1482-
* 'G43.2 Hn' - applies an additional simultaneous tool offset to subsequent motions by adding the offset(s) of tool n.
1479+
* 'G43.2 H__n__' - applies an additional simultaneous tool offset to subsequent motions by adding the offset(s) of tool _n_.
14831480

14841481
* 'G43.2 axes' - applies an additional simultaneous tool offset to subsequent motions by adding the value(s) of any axis words.
14851482

1486-
.G43.2 Hn Example
1483+
.G43.2 H__n__ Example
14871484
[source,{ngc}]
14881485
----
14891486
G90 (set absolute mode)
@@ -1509,14 +1506,12 @@ geometry offsets and which are wear offsets, or that you should have
15091506
only one of each.
15101507

15111508
Like the other G43 commands, G43.2 does not cause any motion. The next
1512-
time a compensated axis is moved, that axis's endpoint is the compensated
1513-
location.
1509+
time a compensated axis is moved, that axis's endpoint is the compensated location.
15141510

15151511
It is an error if:
15161512

15171513
* 'H' is unspecified and no axis offsets are specified.
1518-
* 'H' is specified and the given tool number does not exist in the tool
1519-
table.
1514+
* 'H' is specified and the given tool number does not exist in the tool table.
15201515
* 'H' is specified and axes are also specified.
15211516

15221517
NOTE: G43.2 does not write to the tool table.
@@ -1849,8 +1844,7 @@ the bottom of the hole.
18491844
The length of the dwell is specified by a 'P-' word in the G74 block.
18501845
The feed rate 'F-' is spindle speed multiplied by distance per revolution
18511846
(thread pitch).
1852-
In example S100 with 1.25MM per revolution thread pitch gives a feed of
1853-
F125.
1847+
In example S100 with 1.25MM per revolution thread pitch gives a feed of F125.
18541848

18551849
[[gcode:g76]]
18561850
== G76 Threading Cycle(((G76 Threading Cycle)))
@@ -1945,7 +1939,7 @@ It is an error if:
19451939
* 'E-' is greater than half the drive line length.
19461940

19471941
.HAL Connections
1948-
The pins 'spindle.N.at-speed' and the 'encoder.n.phase-Z' for the
1942+
The pins 'spindle.N.at-speed' and the 'encoder._n_.phase-Z' for the
19491943
spindle must be connected in your HAL file before G76 will work.
19501944
See the <<sec:motion-pins,spindle>> pins in the Motion section for more
19511945
information.

docs/src/gcode/m-code.adoc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -697,13 +697,12 @@ parameter of the INI file) is executed with the optional P and Q values
697697
as its two arguments.
698698

699699
Execution of the G-code file pauses until the external program exits.
700-
If the external program exits with exit code other than '0' gcode program execution is
701-
stopped.
700+
If the external program exits with exit code other than '0' G-code program execution is stopped.
702701
Any valid executable file can be used. The file must be located in the search
703702
path specified in the INI file configuration.
704703
See the <<sub:ini:sec:display,Display>> section for more information on search paths.
705704

706-
After creating a new M1nn program, the GUI should be restarted so that the
705+
After creating a new M1__nn__ program, the GUI should be restarted so that the
707706
new program is taken into account, otherwise a 'Unknown M-code' error will occur.
708707

709708
[WARNING]
@@ -714,11 +713,11 @@ in other operating systems to create or edit the files.
714713

715714
The error 'Unknown M-code used' denotes one of the following:
716715

717-
* The specified User Defined Command does not exist
718-
* The file is not an executable file
719-
* The file name has an extension
720-
* The file name does not follow this format Mnnn where nnn = 100 through 199
721-
* The file name used a lower case M
716+
* The specified User Defined Command does not exist.
717+
* The file is not an executable file.
718+
* The file name has an extension.
719+
* The file name does not follow this format Mnnn where nnn = 100 through 199.
720+
* The file name used a lower case M.
722721

723722
For example to open and close a collet closer that is controlled by a
724723
parallel port pin using a bash script file using M101 and M102. Create two

docs/src/gui/axis.adoc

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -754,13 +754,11 @@ running 'in-place', this can be done by using 'scripts/rip-environment'.
754754
[[sec:axis-lathe-mode]]
755755
== Using AXIS in Lathe Mode(((AXIS:Lathe Mode)))
756756

757-
By including the line 'LATHE = 1'
758-
in the [DISPLAY] section of the INI file, AXIS selects lathe mode. The
759-
'Y' axis is not shown in coordinate readouts, the view is changed to
760-
show the Z axis extending to the right and the X axis extending towards
761-
the bottom of the screen, and several controls (such as those for
762-
preset views) are removed. The coordinate readouts for X are replaced
763-
with diameter and radius.
757+
By including the line 'LATHE = 1' in the [DISPLAY] section of the INI file, AXIS selects lathe mode.
758+
The 'Y' axis is not shown in coordinate readouts, the view is changed
759+
to show the Z axis extending to the right and the X axis extending towards
760+
the bottom of the screen, and several controls (such as those for preset views) are removed.
761+
The coordinate readouts for X are replaced with diameter and radius.
764762

765763
.AXIS Lathe Mode
766764
image::images/axis-lathe.png["AXIS Lathe Mode",align="center"]

docs/src/gui/gmoccapy.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,11 +655,11 @@ To connect encoders, the following pins are exported:
655655
- *gmoccapy.jog.jog-velocity.count-enable* _(bit IN)_ - Must be True, to enable counts
656656
- *gmoccapy.feed.feed-override.counts* _(s32 IN)_ - feed override
657657
- *gmoccapy.feed.feed-override.count-enable* _(bit IN)_ - Must be True, to enable counts
658-
- *gmoccapy.feed.reset-feed-override* _(bit IN)_ - reset the feed override to *0%
658+
- *gmoccapy.feed.reset-feed-override* _(bit IN)_ - reset the feed override to 0%
659659
- *gmoccapy.spindle.spindle-override.counts* _(s32 IN)_ - spindle override
660660
- *gmoccapy.spindle.spindle-override.count-enable* _(bit IN)_ - Must be True, to enable counts
661-
- *gmoccapy.spindle.reset-spindle-override* _(bit IN)_ - reset the spindle override to *0%
662-
- *gmoccapy.rapid.rapid-override.counts* _(s32 IN)_ - Maximal Velocity of the *chine
661+
- *gmoccapy.spindle.reset-spindle-override* _(bit IN)_ - reset the spindle override to 0%
662+
- *gmoccapy.rapid.rapid-override.counts* _(s32 IN)_ - Maximal velocity of the machine
663663
- *gmoccapy.rapid.rapid-override.count-enable* _(bit IN)_ - Must be True, to enable counts
664664

665665
To connect potentiometers, use the following pins:

docs/src/gui/gui-dev-reference.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ filter extension = program to run
166166
[source,{ini}]
167167
----
168168
[FILTER]
169-
# Controls what programs are shown in the file manager
169+
# Controls what programs are shown in the file manager:
170170
PROGRAM_EXTENSION = .ngc,.nc,.tap G-Code File (*.ngc,*.nc,*.tap)
171171
PROGRAM_EXTENSION = .png,.gif,.jpg Greyscale Depth Image
172172
PROGRAM_EXTENSION = .py Python Script
173173
174-
# specifies what special 'filter' programs runs based on program ending
174+
# Maps data/source code file extensions to a special 'filter' program for the display/execution:
175175
png = image-to-gcode
176176
gif = image-to-gcode
177177
jpg = image-to-gcode

docs/src/gui/qtvcp-libraries.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ Requires no user intervention.
996996
* *okdialog* - _requiring the user to click OK to close the dialog_. +
997997
OK messages have _two HAL pins_:
998998
** One HAL pin to launch the dialog, and
999-
** One to signify it's waiting for response.
999+
** one to signify it is waiting for a response.
10001000
* *yesnodialog* - _requiring the user to select yes or no buttons to close the dialog_. +
10011001
Yes/No messages have _three HAL pins_:
10021002
** One to show the dialog,
@@ -1089,7 +1089,7 @@ Requires no user intervention.
10891089
* *okdialog* - _requiring the user to click OK to close the dialog_. +
10901090
OK messages use _two HAL pins_:
10911091
** One HAL pin to launch the dialog, and
1092-
** One to signify it's waiting for response.
1092+
** one to signify it's waiting for response.
10931093
* *yesnodialog* - _requiring the user to select yes or no buttons to close the dialog_. +
10941094
Yes/No messages use _three HAL pins_:
10951095
** One to show the dialog,

0 commit comments

Comments
 (0)