Skip to content

Commit c09a70c

Browse files
committed
docs: Mostly punctuation.
1 parent 0207414 commit c09a70c

11 files changed

Lines changed: 75 additions & 95 deletions

docs/src/gui/qtvcp-vismach.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ Sets the _display color of the part based on a designated HAL bit pin state_. +
409409
`hal_comp`;; The _HAL component Object_ or None. +
410410
In QtVCP if you are reading _system pins_ directly, then the component argument is set to `None`. +
411411
`hal_pin`;; The _name of the BIT HAL IN pin_ that will change the color. +
412-
if hal_comp is 'None' then this must be the full name of a system pin other wise this is the pin name excluding the component name
412+
if hal_comp is 'None' then this must be the full name of a system pin other wise this is the pin name excluding the component name.
413413

414414
=== HALColorRGB
415415
Sets the _display color of the part based on a designated HAL U32 pin value_. +
@@ -424,7 +424,7 @@ combined as 0xXXBBGGRR +
424424
`hal_comp`;; The _HAL component Object_ or None. +
425425
In QtVCP if you are reading _system pins_ directly, then the component argument is set to `None`. +
426426
`hal_pin`;; The _name of the U32 HAL IN pin_ that will change the color. +
427-
if hal_comp is 'None' then this must be the full name of a system pin other wise this is the pin name excluding the component name +
427+
if hal_comp is 'None' then this must be the full name of a system pin other wise this is the pin name excluding the component name. +
428428
`alpha=`;; Sets the opacity. (0-1.0)
429429

430430
=== Heads Up Display
@@ -477,11 +477,10 @@ chuckassembly = HideCollection([chuckassembly],comp,'hide-chuck')
477477
chuckassembly = HideCollection([chuckassembly],None,'myvismach.hide-chuck')
478478
----
479479

480-
=== Plot Color Based on Mtotion Type
481-
If you wish to plot different colors for different motions you need to add some more python code. +
480+
=== Plot Color Based on Motion Type
481+
If you wish to plot different colors for different motions you need to add some more Python code.
482482

483-
484-
add this at the top of the file:
483+
Add this at the top of the file:
485484

486485
[source,python]
487486
----
@@ -499,7 +498,8 @@ and this to the Window class:
499498
#v.setColorsAttribute('FEED',(0,1,0))
500499
#print(v.colors)
501500
----
502-
You can set DEFAULT, FEED, TRAVERSE, ARC, PROBE, ROTARYINDEX, TOOLCHANGE colors with setColorsAttribute()
501+
502+
You can set DEFAULT, FEED, TRAVERSE, ARC, PROBE, ROTARYINDEX, TOOLCHANGE colors with setColorsAttribute().
503503

504504
=== Capture
505505
This sets the current position in the model.
@@ -603,7 +603,7 @@ class Window(QWidget):
603603
604604
# uncomment to change feed color
605605
#v.setColorsAttribute('FEED',(0,1,0))
606-
# and to see all colors printed to the terminal
606+
# and to see all colors printed to the terminal
607607
#print(v.colors)
608608
609609
v.model = Collection([model, world])

docs/src/gui/qtvcp-widgets.adoc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ Allows one to *adjust a HAL pin value using a sliding pointer*.
457457

458458
[[sub:qtvcp:widgets:tabwidget]]
459459
=== `TabWidget` - Tab Widget
460-
This widget allows the tab height to be adjusted with stylesheets
460+
This widget allows the tab height to be adjusted with stylesheets.
461461

462462
The `TabWidget` properties can be defined in a _stylesheet_ with the following code added to the `.qss` file. +
463463
`name_of_tab` being the widget name defined in Qt Designer's editor. +
@@ -719,22 +719,22 @@ usually this is selected from the screenOptions widget.
719719
*`halpin_option`*::
720720
Will set a HAL pin true when the axis is selected.
721721
*`joint_number`*::
722-
Should be set to the appropriate joint number
722+
Should be set to the appropriate joint number.
723723
*`axis_letter`*::
724-
Should be set to the appropriate axis letter
724+
Should be set to the appropriate axis letter.
725725

726726
These are the click-and-hold menu properties: +
727727

728728
*`showLast`*::
729-
show the 'Set to last' action
729+
Show the 'Set to last' action.
730730
*`showDivide`*::
731-
show the 'Divide by 2' action
731+
Show the 'Divide by 2' action.
732732
*`showGotoOrigin`*::
733-
show the 'Go to G53/G5x origin' action
733+
Show the 'Go to G53/G5x origin' action.
734734
*`showZeroOrigin`*::
735-
show the 'Zero Origin' action
735+
Show the 'Zero Origin' action.
736736
*`showSetOrigin`*::
737-
show the 'Set Origin' action
737+
Show the 'Set Origin' action.
738738
*`dialog_code_string`*::
739739
Sets which dialog will pop up with numerical entry,
740740
i.e. 'ENTRY' or 'CALCULATOR' to call a typing only entry dialog or a touch/typing calculator type entry dialog.
@@ -811,15 +811,15 @@ You can also click on the label and see a list of actions. +
811811
These are the click-on-menu options:
812812

813813
*`showLast`*::
814-
show the 'Set to last' action
814+
Show the 'Set to last' action.
815815
*`showDivide`*::
816-
show the 'Divide by 2' action
816+
Show the 'Divide by 2' action.
817817
*`showGotoOrigin`*::
818-
show the 'Go to G53/G5x origin' action
818+
Show the 'Go to G53/G5x origin' action.
819819
*`showZeroOrigin`*::
820-
show the 'Zero Origin' action
820+
Show the 'Zero Origin' action.
821821
*`showSetOrigin`*::
822-
show the 'Set Origin' action
822+
Show the 'Set Origin' action.
823823
*`dialogName`*::
824824
Sets which dialog window will pop up with numerical entry, i.e. ENTRY or CALCULATOR.
825825

docs/src/gui/qtvcp.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ Subclassing just means our handler file first loads the original handler file an
233233
This is useful for changing/adding behaviour while still retaining standard handler updates from LinuxCNC repositories.
234234

235235
You may still need to use the handler copy dialog to copy the original handler file to decide how to patch it.
236-
See 'custom handler file'
236+
See 'custom handler file'.
237237

238238
There should be a folder in the config folder; for screens: named '<CONFIG FOLDER>/qtvcp/screens/<SCREEN NAME>/' +
239239
add the handle patch file there, named like so <ORIGINAL SCREEN NAME>_handler.py, +
@@ -304,8 +304,8 @@ This file will be read and executed as Python code in the *handler file context*
304304
*Only local functions and local attributes* can be referenced. +
305305
Global libraries defined in the screen's handler file can be referenced by importing the handler file. +
306306
These are usually seen as all capital words with no preceding self. +
307-
'self' references the window class functions +
308-
'self.w' typically references the widgets
307+
'self' references the window class functions. +
308+
'self.w' typically references the widgets.
309309

310310
What can be used can vary by screen and development cycle.
311311

docs/src/man/man1/halshow.1.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For format see https://www.tcl.tk/man/tcl8.6.11/TclCmd/format.html[]
2020

2121
Example: "%.5f" displays a float with 5 digits right of the decimal point.
2222

23-
--noprefs:: Don't use preference file to save settings
23+
--noprefs:: Don't use preference file to save settings.
2424

2525
== DESCRIPTION
2626

@@ -39,8 +39,8 @@ LinuxCNC 2.9::
3939
- Added buttons for pin/parameter/signal manipulation.
4040
- Added menu entries for setting update interval, adding manually.
4141
- Added right-click menu for copy, set, unlink pin and remove from view.
42-
- Added button to expand/collapse the tree view
43-
- Added search entry
42+
- Added button to expand/collapse the tree view.
43+
- Added search entry.
4444

4545
== BUGS
4646

docs/src/man/man1/lineardelta.1.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ lineardelta - Vismach Virtual Machine GUI
77
== DESCRIPTION
88

99
*lineardelta* is one of the sample *Vismach* GUIs for LinuxCNC,
10-
simulating a delta robot with linear actuators
11-
10+
simulating a delta robot with linear actuators.
1211

1312
== SEE ALSO
1413

docs/src/man/man1/mitsub_vfd.1.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ connector.
1515
__number1__:: is the slave number that was set on the VFD. Must be two digits (Parameter 117).
1616
name__N__=number__N__:: can be repeated for multiple VFD's connected together.
1717
*--baud* _baudrate_:: is optional as it defaults to 9600, all networked vfds must be set to the same baudrate.
18-
*--port* _devicename_:: is optional as it defaults to `ttyS0``, a common alternative is `/dev/ttyUSB0`.
18+
*--port* _devicename_:: is optional as it defaults to `ttyS0`, a common alternative is `/dev/ttyUSB0`.
1919

2020
== DESCRIPTION
2121

@@ -99,7 +99,7 @@ _VFD_NAME_**.stat-bit-3** (bit, out):: Raw status bit. Configure the VFD so that
9999
_VFD_NAME_**.stat-bit-4** (bit, out):: Raw status bit
100100
_VFD_NAME_**.stat-bit-5** (bit, out):: Raw status bit
101101
_VFD_NAME_**.stat-bit-6** (bit, out):: Raw status bit
102-
_VFD_NAME_**.stat-bit-7** (bit, out):: Raw status bit. Configure the VFD so that the function 'alarm' is assigned to status bit 7 (parameter 195 for 700 series)
102+
_VFD_NAME_**.stat-bit-7** (bit, out):: Raw status bit. Configure the VFD so that the function 'alarm' is assigned to status bit 7 (parameter 195 for 700 series).
103103

104104
== SAMPLE HAL
105105

docs/src/man/man1/vfs11_vfd.1.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ This component reads and writes to the vfs11 via a Modbus connection.
156156
Do-not-exceed soft limit for motor RPM (defaults to __nameplate-RPM__).
157157

158158
<name>.tolerance (float, RW)::
159-
Speed tolerance (default 0.01) for determining whether spindle is at speed (0.01 meaning: output frequency is within 1% of target frequency)
159+
Speed tolerance (default 0.01) for determining whether spindle is at speed (0.01 meaning: output frequency is within 1% of target frequency).
160160

161161
== USAGE
162162

@@ -169,7 +169,7 @@ Operating parameters are still read while bus control is disabled.
169169
Exiting the vfs11_vfd driver in a controlled will release the VFD from the bus and restore panel control.
170170

171171
See the LinuxCNC Integrators Manual for more information.
172-
For a detailed register description of the Toshiba VFD's,
172+
For a detailed register description of the Toshiba VFDs,
173173
see the "TOSVERT VF-S11 Communications Function Instruction Manual" (Toshiba document number E6581222)
174174
and the "TOSVERT VF-S11 Instruction manual" (Toshiba document number E6581158).
175175

docs/src/man/man1/xyzbc-trt-gui.1.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ xyzbc-trt-gui - Vismach Virtual Machine GUI
77
== DESCRIPTION
88

99
*xyzbc-trt-gui* is one of the sample *Vismach* GUIs for LinuxCNC,
10-
simulating a 5-axis milling machine with tool-point kinematics
10+
simulating a 5-axis milling machine with tool-point kinematics.
1111

1212
See the main LinuxCNC documentation for more details.
1313

docs/src/man/man9/hostmot2.9.adoc

Lines changed: 40 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -328,41 +328,32 @@ count_64 (s64 out)::
328328
position (float out)::
329329
Encoder position in position units (count / scale).
330330
position-interpolated (float out)::
331-
Encoder interpolated position in position units (count / scale). Only
332-
valid when velocity is approximately constant and the time between
333-
counts is less than the velocity timeout parameter value. Do not use
334-
for position control. Useful for spindle synchronized moves with low
335-
resolution encoders.
331+
Encoder interpolated position in position units (count / scale).
332+
Only valid when velocity is approximately constant and the time between counts is less than the velocity timeout parameter value.
333+
Do not use for position control. Useful for spindle synchronized moves with low resolution encoders.
336334
position-latched (float out)::
337335
Encoder latched position in position units (count / scale).
338336
velocity (float out)::
339337
Estimated encoder velocity in position units per second.
340338
velocity-rpm (float out)::
341339
Estimated encoder velocity in position units per minute.
342340
reset (bit in)::
343-
When this pin is True, the count and position pins are set to 0 (the
344-
value of the velocity pin is not affected by this). The driver does
345-
not reset this pin to FALSE after resetting the count to 0, that is
346-
the user's job.
341+
When this pin is True, the count and position pins are set to 0 (the value of the velocity pin is not affected by this).
342+
The driver does not reset this pin to FALSE after resetting the count to 0, that is the user's job.
347343
index-enable (bit in/out)::
348344
When this pin is set to True, (and no-clear-on-index is false)
349-
the count (and therefore also position) are reset to zero on the next
350-
Index (Phase-Z) pulse. At the same time, index-enable is reset to zero
351-
to indicate that the pulse has occurred.
345+
the count (and therefore also position) are reset to zero on the next Index (Phase-Z) pulse.
346+
At the same time, index-enable is reset to zero to indicate that the pulse has occurred.
352347
no-clear-on-index (bit in)::
353-
When this pin is set to True, the count (and therefore also position)
354-
are NOT reset to zero on the next Index (Phase\-Z) pulse.
355-
On an index event the latched count and position will be set to
356-
indicate the count and position where the index occurred.
348+
When this pin is set to True, the count (and therefore also position) are NOT reset to zero on the next Index (Phase\-Z) pulse.
349+
On an index event the latched count and position will be set to indicate the count and position where the index occured.
357350
probe-enable (bit in/out)::
358-
When this pin is set to True, the encoder count (and therefore also
359-
position) are latched on the the next probe active edge. At the same
360-
time, probe-enable is reset to zero to indicate that latch event has
361-
occurred (only present if supported by firmware).
351+
When this pin is set to True, the encoder count (and therefore also position) are latched on the the next probe active edge.
352+
At the same time, probe-enable is reset to zero to indicate that latch event has occurred.
353+
(only present if supported by firmware)
362354
probe-invert (bit r/w)::
363-
If set to True, the rising edge of the probe input pin triggers the
364-
latch event (if probe-enable is True). If set to False, the falling
365-
edge triggers (only present if supported by firmware).
355+
If set to True, the rising edge of the probe input pin triggers the latch event (if probe-enable is True).
356+
If set to False, the falling edge triggers. (only present if supported by firmware)
366357
rawcounts (s32 out)::
367358
Total number of encoder counts since the start, not adjusted for index or reset.
368359
rawcounts_64 (s64 out)::
@@ -374,8 +365,8 @@ count_latch_64 (s64 out)::
374365
input-a, input-b, input-index (bit out)::
375366
Real time filtered values of A,B,Index encoder signals
376367
quad-error-enable (bit in)::
377-
When this pin is True quadrature error reporting is enabled. When
378-
False, existing quadrature errors are cleared and error reporting is disabled.
368+
When this pin is True quadrature error reporting is enabled.
369+
When False, existing quadrature errors are cleared and error reporting is disabled.
379370
quad-error (bit out)::
380371
This bit indicates that a quadrature sequence error has been detected.
381372
It can only be set if the corresponding quad-error-enable bit is True.
@@ -388,12 +379,11 @@ hm2_XXXX.N.encoder.muxed-sample-frequency (u32 in)::
388379
This also sets the encoder multiplexing frequency.
389380
hm2_XXXX.N.encoder.muxed-skew (float in)::
390381
This sets the muxed encoder sample time delay (in ns) from the multiplex signal.
391-
Setting this properly can increase the usable
392-
multiplex frequency and compensate for cable delays (suggested value
393-
is 3* cable length in feet +20).
382+
Setting this properly can increase the usable multiplex frequency and compensate for cable delays
383+
(suggested value is 3* cable length in feet +20).
394384
hm2_XXXX.N.encoder.hires-timestamp (bit in)::
395-
When this pin is True the encoder timestamp counter frequency is
396-
ca. 10&#8201;MHz when False the timestamp counter frequency is ca. 2&#8201;MHz.
385+
When this pin is True the encoder timestamp counter frequency is ca. 10 MHz.
386+
When False the timestamp counter frequency is ca. 2&#8201;MHz.
397387
This should be set True for frequency counting applications to improve the resolution.
398388
It should be set False when servo thread periods longer than 1&#8201;ms are used.
399389

@@ -512,23 +502,19 @@ e: (Encoder):: (s32, out) hm2_XXXX.N.ssi.MM.<name>.count. +
512502
(bit, in) (bit, out) hm2_XXXX.N.ssi.MM.<name>.reset. +
513503
When this pin is set high the counts and position pins are zeroed.
514504
h: (Split encoder, high-order bits)::
515-
Some encoders (Including Fanuc) place the encoder part-turn counts and
516-
full-turn counts in separate, non-contiguous fields. This tag defines
517-
the high-order bits of such an encoder module. There can be only one h
518-
and one l tag per channel, the behaviour with multiple such channels
519-
will be undefined.
505+
Some encoders (Including Fanuc) place the encoder part-turn counts and full-turn counts in separate, non-contiguous fields.
506+
This tag defines the high-order bits of such an encoder module.
507+
There can be only one h and one l tag per channel, the behaviour with multiple such channels will be undefined.
520508
l: (Split encoder, low-order bits)::
521509
Low order bits (see "h")
522510
g: (Gray-code):: This is a modifier that indicates that the following format string is gray-code encoded.
523511
This is only valid for encoders (e, h l) and unsigned (u) data types.
524512
m: (Multi-turn)::
525-
This is a modifier that indicates that the following
526-
format string is a multi-turn encoder. This is only valid for encoders
527-
(e, h l). A jump in encoder position of more than half the full scale
528-
is interpreted as a full turn and the counts are wrapped. With a
529-
multi-turn encoder this is only likely to be a data glitch and will
530-
lead to a permanent offset. This flag endures that such encoders will
531-
never wrap.
513+
This is a modifier that indicates that the following format string is a multi-turn encoder.
514+
This is only valid for encoders (e, h l).
515+
A jump in encoder position of more than half the full scale is interpreted as a full turn and the counts are wrapped.
516+
With a multi-turn encoder this is only likely to be a data glitch and will lead to a permanent offset.
517+
This flag endures that such encoders will never wrap.
532518

533519
*Parameters*
534520

@@ -630,9 +616,8 @@ velocity-rpm (float, out)::
630616
count (s32, out)::
631617
This pins outputs a simulated encoder count at 2^24^ counts per rev (16777216 counts).
632618
rawcounts (s32, out)::
633-
This is identical to the counts pin, except it is not reset by the
634-
"index" or "reset" pins. This is the pin which would be linked to the
635-
bldc HAL component if the resolver was being used to commutate a motor.
619+
This is identical to the counts pin, except it is not reset by the "index" or "reset" pins.
620+
This is the pin which would be linked to the bldc HAL component if the resolver was being used to commutate a motor.
636621
reset (bit, in)::
637622
Resets the position and counts pins to zero immediately.
638623
joint-pos-fb (bit, in)::
@@ -648,13 +633,11 @@ joint-pos-fb (bit, in)::
648633
This feature will only work properly if the machine is initially homed to "index"
649634
and if the axis home positions are exactly zero.
650635
index-enable (bit, in/out)::
651-
When this pin is set high the position and counts pins will be reset
652-
the next time the resolver passes through the zero position. At the
653-
same time the pin is driven low to indicate to connected modules that
654-
the index has been seen, and that the counters have been reset.
636+
When this pin is set high the position and counts pins will be reset the next time the resolver passes through the zero position.
637+
At the same time the pin is driven low to indicate to connected modules that the index has been seen, and that the counters have been reset.
655638
error (bit, out)::
656-
Indicates an error in the particular channel. If this value is "True"
657-
then the reported position and velocity are invalid.
639+
Indicates an error in the particular channel.
640+
If this value is "True" then the reported position and velocity are invalid.
658641

659642
*Parameters:*
660643

@@ -673,14 +656,12 @@ index-divisor (default 1) (u32, read/write)::
673656
It is not appropriate to use this parameter for index-homing of axis drives.
674657

675658
excitation-khz (float, read/write)::
676-
This pin sets the excitation frequency for the resolver. This pin is
677-
module-level rather than instance-level as all resolvers share the
678-
same excitation frequency. Valid values are 10 (ca. 10 kHz), 5 (ca. 5 kHz)
679-
and 2.5 (ca. 2.5 kHz). The actual frequency depends on the FPGA
680-
frequency, and they correspond to CLOCK_LOW/5000, CLOCK_LOW/10000 and
681-
CLOCK_LOW/20000 respectively. The parameter will be set to the closest
682-
available of the three frequencies. A value of -1 (the default)
683-
indicates that the current setting should be retained.
659+
This pin sets the excitation frequency for the resolver.
660+
This pin is module-level rather than instance-level as all resolvers share the same excitation frequency.
661+
Valid values are 10 (ca. 10 kHz), 5 (ca. 5 kHz) and 2.5 (ca. 2.5 kHz).
662+
The actual frequency depends on the FPGA frequency, and they correspond to CLOCK_LOW/5000, CLOCK_LOW/10000 and CLOCK_LOW/20000 respectively.
663+
The parameter will be set to the closest available of the three frequencies.
664+
A value of -1 (the default) indicates that the current setting should be retained.
684665

685666
use-position-file (bit, read/write)::
686667
In conjunction with *joint-pos-fb* (qv) emulate absolute encoders.

0 commit comments

Comments
 (0)