Skip to content

Commit a01e871

Browse files
authored
Merge pull request #2430 from smoe/docs29_lenovo_100
Docs - optics (smoe:docs29_lenovo_100)
2 parents 160c55c + 32738ff commit a01e871

9 files changed

Lines changed: 106 additions & 106 deletions

File tree

docs/man/man9/hostmot2.9

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ This would be set to 1.5 ms for 1-2 ms servos for a 0 center position.
882882
(float rw) scale
883883
Sets the per channel pulse width scaling.
884884
For example, setting the scale to 90 and the offset to 1.5 ms would result in a position range of +-45 degrees
885-
and scale in degrees for 1-2 ms servos with a full motion range of 90 degrees
885+
and scale in degrees for 1-2 ms servos with a full motion range of 90 degrees.
886886

887887
.SS stepgen
888888

docs/man/man9/sserial.9

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,7 @@ This is intended as a speed control signal for a VFD.
272272

273273
\fBParameters:\fR
274274

275-
(bit rw) .7i77.0.0.output\-NN\-invert: Invert the sense of the corresponding
276-
output pin.
275+
(bit rw) .7i77.0.0.output\-NN\-invert: Invert the sense of the corresponding output pin.
277276

278277
(bit rw) .7i77.0.0.spindir\-invert: Invert the sense of the spindle direction pin.
279278

docs/src/config/ini-config.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ See <<cha:gmoccapy,GMOCCAPY>> document for GMOCCAPY details.
350350
. UVW translation example: `GEOMETRY=XYZUVW` causes UVW to move in the coordinate system of the tool and XYZ to move in the coordinate system of the material.
351351
. Foam-cutting machines (`FOAM = 1`) should specify "XY;UV" or leave the value blank even though this value is presently ignored in foam-cutter mode.
352352
A future version may define what ";" means, but if it does "XY;UV" will mean the same as the current foam default.
353-
. Experimental: If the "*!*` character is included in the GEOMETRY string, display points for A, B, C rotations respect the X, Y, Z offsets set by G5x, G92 codes.
353+
. Experimental: If the exclamation mark (`!`) character is included in the GEOMETRY string, display points for A, B, C rotations respect the X, Y, Z offsets set by G5x, G92 codes.
354354
Example: Using `GEOMETRY = !CXZ` for a machine with `[TRAJ]COORDINATES=XZC`.
355355
This provision applies for liveplots only -- G-code previews should be done with zero G5x, G92 offsets.
356356
This can be facilitated by setting offsets in programs only when task is running as indicated by #<_task> == 1.
@@ -370,15 +370,15 @@ If no `[DISPLAY]GEOMETRY` is included in the INI file, a default is provided by
370370
This is useful if you have multiple configurations on one computer.
371371
* `JOG_AXES =` - The order in which jog keys are assigned to axis letters.
372372
The left and right arrows are assigned to the first axis letter, up and down to the second, page up/page down to the third, and left and right bracket to the fourth.
373-
If unspecified, the default is determined from the [TRAJ]COORDINATES, [DISPLAY]LATHE and [DISPLAY]FOAM values.
373+
If unspecified, the default is determined from the `[TRAJ]COORDINATES`, `[DISPLAY]LATHE` and `[DISPLAY]FOAM` values.
374374
* `JOG_INVERT =` - For each axis letter, the jog direction is inverted.
375375
The default is "X" for lathes and blank otherwise.
376376
+
377377
[NOTE]
378378
The settings for `JOG_AXES` and `JOG_INVERT` apply to world mode jogging by axis coordinate letter and are in effect while in world mode after successful homing.
379379
When operating in joint mode prior to homing, keyboard jog keys are assigned in a fixed sequence: left/right: joint0, up/down: joint1, page up/page down: joint2, left/right bracket: joint3
380380

381-
* `USER_COMMAND_FILE = mycommands.py` - The name of an optional, configuration-specific Python file sourced by the axis GUI instead of the user-specific file `~/.axisrc`.
381+
* `USER_COMMAND_FILE = mycommands.py` - The name of an optional, configuration-specific Python file sourced by the AXIS GUI instead of the user-specific file `~/.axisrc`.
382382

383383
[NOTE]
384384
The following `[DISPLAY]` item is used by the TKLinuxCNC interface only.
@@ -497,7 +497,7 @@ if __name__ == "__main__":
497497
because the modal codes of machines differ, and may be changed by G-code interpreted earlier in the session.
498498
* `SUBROUTINE_PATH = ncsubroutines:/tmp/testsubs:lathesubs:millsubs` - (((SUBROUTINE PATH)))
499499
Specifies a colon (:) separated list of up to 10 directories to be searched when single-file subroutines are specified in G-code.
500-
These directories are searched after searching [DISPLAY]PROGRAM_PREFIX (if it is specified) and before searching `[WIZARD]WIZARD_ROOT` (if specified).
500+
These directories are searched after searching `[DISPLAY]PROGRAM_PREFIX` (if it is specified) and before searching `[WIZARD]WIZARD_ROOT` (if specified).
501501
The paths are searched in the order that they are listed.
502502
The first matching subroutine file found in the search is used.
503503
Directories are specified relative to the current directory for the INI file or as absolute paths.
@@ -511,9 +511,9 @@ if __name__ == "__main__":
511511
+
512512
A search is made for each possible user defined function, typically (M100-M199). The search order is:
513513
+
514-
. [DISPLAY]PROGRAM_PREFIX (if specified)
515-
. If [DISPLAY]PROGRAM_PREFIX is not specified, search the default location: nc_files
516-
. Then search each directory in the list [RS274NGC]USER_M_PATH
514+
. `[DISPLAY]PROGRAM_PREFIX` (if specified)
515+
. If `[DISPLAY]PROGRAM_PREFIX` is not specified, search the default location: nc_files
516+
. Then search each directory in the list `[RS274NGC]USER_M_PATH`.
517517
+
518518
The first executable M1__xx__ found in the search is used for each M1__xx__.
519519

docs/src/gui/gmoccapy.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ You can specify the log level in the INI file like this:
498498
[DISPLAY]
499499
DISPLAY = gmoccapy <log_level_param>
500500
----
501-
using this parameters:
501+
using these parameters:
502502
----
503503
Log level <log_level_param>
504504
DEBUG -d

0 commit comments

Comments
 (0)