Skip to content

Commit 34e39ca

Browse files
authored
Merge pull request #1849 from smoe/docs_stupid_simple_stuff
Docs stupid simple stuff
2 parents e398a8b + 3a6bb1f commit 34e39ca

21 files changed

Lines changed: 218 additions & 226 deletions

docs/man/man3/hal_init.3hal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ Call only from within user or init/cleanup code, not from relatime tasks.
2525

2626
.SH RETURN VALUE
2727
On success, returns a positive integer module ID, which is
28-
used for subsequent calls to hal and rtapi APIs.
28+
used for subsequent calls to HAL and rtapi APIs.
2929
On failure, returns a HAL error code.

docs/man/man3/hal_malloc.3hal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ hal_malloc \- Allocate space in the HAL shared memory area
99

1010
.SH ARGUMENTS
1111
.IP \fIsize\fR
12-
Gives the size, in bytes, of the block
12+
Gives the size, in bytes, of the block.
1313

1414
.SH DESCRIPTION
1515
\fBhal_malloc\fR allocates a block of memory from the main HAL shared memory area.

docs/src/gcode/o-code.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ change in the future.
4444

4545
The behavior is undefined if:
4646

47-
* The same number is used for more than one block
48-
* Other words are used on a line with an O- word
49-
* Comments are used on a line with an O-word
47+
* The same number is used for more than one block.
48+
* Other words are used on a line with an O- word.
49+
* Comments are used on a line with an O-word.
5050

5151
[NOTE]
5252
Using the lower case 'o' makes it easier to distinguish from a 0
@@ -369,7 +369,7 @@ o[#101+2] call
369369
----
370370

371371
.Computing values in O-words
372-
For more information on computing values see the following sections
372+
For more information on computing values see the following sections:
373373

374374
* <<sec:overview-parameters,Parameters>>
375375
* <<gcode:expressions,Expressions>>
@@ -381,7 +381,7 @@ For more information on computing values see the following sections
381381

382382
To call a separate file with a subroutine name the file the same as
383383
your call and include a sub and endsub in the file. The file must be in the
384-
directory pointed to by 'PROGRAM_PREFIX' or 'SUBROUTINE_PATH' in the ini file.
384+
directory pointed to by 'PROGRAM_PREFIX' or 'SUBROUTINE_PATH' in the INI file.
385385
The file name can include *lowercase* letters, numbers, dash, and underscore
386386
only. A named subroutine file can contain only a single subroutine definition.
387387

docs/src/gcode/other-code.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
The application of the feed rate is as described in the
1414
<<sub:feed-rate,Feed Rate>> Section, unless 'inverse time feed rate mode'
1515
or 'feed per revolution mode' are in effect, in which case the feed rate
16-
is as described in the <<gcode:g93-g94-g95,G93 G94 G95>> Section.
16+
is as described in the <<gcode:g93-g94-g95,G93 G94 G95>> section.
1717

1818
[[sec:set-spindle-speed]]
1919
== S: Set Spindle Speed(((S: Set Spindle Speed)))
2020

2121
'Sx [$n]' - set the speed of the spindle to 'x' revolutions per minute (RPM)
2222
with the optional $ set the spindle speed for a specific spindle. Without the $
23-
the command will default to spindle.0
23+
the command will default to spindle.0.
2424

2525
The spindle(s) or selected spindle will turn at that speed when a 'M3' or 'M4'
2626
is in effect. It is OK to program an S word whether the spindle is turning or

docs/src/gcode/overview.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rate to the programmed end point', and 'X3' provides an argument
2929
value (the value of X should be 3 at the end of the move).
3030
Most LinuxCNC G-code commands start with either G or M (for
3131
General and Miscellaneous). The words for these commands are called 'G
32-
codes' and 'M-codes.'
32+
codes' and 'M-codes'.
3333

3434
The LinuxCNC language has no indicator for the start of a program. The
3535
Interpreter, however, deals with files. A single program may be in a
@@ -273,7 +273,7 @@ value found in parameter 3. The '\#' character may be repeated; for
273273
example '##2' means the value of the parameter whose index is the
274274
(integer) value of parameter 2.
275275

276-
* '31-5000' - G code user parameters. These parameters are global in the G
276+
* '31-5000' - G-code user parameters. These parameters are global in the G
277277
code file, and available for general use. Volatile.
278278
* '5061-5069' - Coordinates of a <<gcode:g38,G38>> probe result (X, Y,
279279
Z, A, B, C, U, V & W). Coordinates are in the coordinate system in
@@ -585,7 +585,7 @@ to the values of INI file entries and HAL pins.
585585
* '#<_ini[section]name>' Returns the value of the corresponding item in
586586
the INI file.
587587

588-
For example, if the ini file looks like so:
588+
For example, if the INI file looks like so:
589589

590590
[source,{ini}]
591591
---------------------------------------------------------------------
@@ -597,7 +597,7 @@ YPOS = 2.718
597597
you may refer to the named parameters `#<_ini[setup]xpos>` and
598598
`#<_ini[setup]ypos>` within G-code.
599599

600-
`EXISTS` can be used to test for presence of a given ini file
600+
`EXISTS` can be used to test for presence of a given INI file
601601
variable:
602602

603603
[source,{ngc}]
@@ -609,10 +609,10 @@ o100 else
609609
o100 endif
610610
---------------------------------------------------------------------
611611

612-
The value is read from the inifile once, and cached in the
612+
The value is read from the INI file once, and cached in the
613613
interpreter. These parameters are read-only - assigning a value will
614614
cause a runtime error. The names are not case sensitive - they are
615-
converted to uppercase before consulting the ini file.
615+
converted to uppercase before consulting the INI file.
616616

617617
* '#<_hal[Hal item]>'
618618
Allows G-code programs to read the values of HAL pins Variable access is
@@ -1222,11 +1222,11 @@ material removal rate.
12221222
* 'G-code out of range' - A G-code greater than G99 was used, the scope of G
12231223
codes in LinuxCNC is 0 - 99. Not every number between 0 and 99 is a valid
12241224
G-code.
1225-
* 'Unknown g code used' - A G-code was used that is not part of the LinuxCNC
1225+
* 'Unknown G-code used' - A G-code was used that is not part of the LinuxCNC
12261226
G-code language.
12271227
* 'i,j,k word with no Gx to use it' - i, j and k words must be used on the same
12281228
line as the G-code.
1229-
* 'Cannot use axis values without a g code that uses them' - Axis values can
1229+
* 'Cannot use axis values without a G-code that uses them' - Axis values can
12301230
not be used on a line without either a modal G-code in effect or a G-code
12311231
on the same line.
12321232
* 'File ended with no percent sign or program end' - Every G-code file must

docs/src/gui/gmoccapy.adoc

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,10 @@ will hide the chosen box.
286286
image::images/gmoccapy_embedded_tabs.png[align="left"]
287287

288288
[NOTE]
289-
If you make any hal connections to your custom glade panel, you need to do that in the hal file
290-
specified in the EMBED_TAB_COMMAND line, otherwise you may get an error that the hal pin does not exist --
291-
this is because of race conditions loading the hal files. Connections to gmoccapy hal pins need to be made in the
292-
postgui hal file specified in your INI file, because these pins do not exist prior of realizing the GUI.
289+
If you make any HAL connections to your custom glade panel, you need to do that in the HAL file
290+
specified in the EMBED_TAB_COMMAND line, otherwise you may get an error that the HAL pin does not exist --
291+
this is because of race conditions loading the HAL files. Connections to gmoccapy HAL pins need to be made in the
292+
postgui HAL file specified in your INI file, because these pins do not exist prior of realizing the GUI.
293293

294294
Here are some examples:
295295

@@ -306,7 +306,7 @@ image::images/gmoccapy_with_left_box_in_edit_mode.png[align="left"]
306306
image::images/gmoccapy_with_right_panel_in_MDI_mode.png[align="left"]
307307

308308
==== Configuration of User Created Messages
309-
Gmoccapy has the ability to create hal driven user messages. To use them you
309+
Gmoccapy has the ability to create HAL driven user messages. To use them you
310310
need to introduce some lines in the [DISPLAY] section of the INI file.
311311

312312
Here is how to set up 3 user pop up message dialogs the messages support pango
@@ -317,7 +317,7 @@ https://developer.gnome.org/pango/stable/PangoMarkupFormat.html[Pango Markup]
317317
----
318318
MESSAGE_TEXT = The text to be displayed, may be pango markup formatted
319319
MESSAGE_TYPE = "status" , "okdialog" , "yesnodialog"
320-
MESSAGE_PINNAME = is the name of the hal pin group to be created
320+
MESSAGE_PINNAME = is the name of the HAL pin group to be created
321321
----
322322

323323
* 'status' : Will just display a message as pop up window, using the messaging
@@ -346,8 +346,8 @@ MESSAGE_TYPE = okdialog
346346
MESSAGE_PINNAME = okdialog
347347
----
348348

349-
The specific hal pin conventions for these can be found under the
350-
<<gmoccapy:user-created-message, User Messages>> hal pin section.
349+
The specific HAL pin conventions for these can be found under the
350+
<<gmoccapy:user-created-message, User Messages>> HAL pin section.
351351

352352
[[gmocappy:rs274ngc]]
353353
=== The RS274NGC Section
@@ -470,7 +470,7 @@ If MAX_VELOCITY is not given, it will default to 600
470470

471471
== HAL Pins
472472

473-
gmoccapy exports several hal pin to be able to react to hardware devices.
473+
gmoccapy exports several HAL pin to be able to react to hardware devices.
474474
The goal is to get a GUI that may be operated in a tool shop, completely/mostly
475475
without mouse or keyboard.
476476

@@ -522,10 +522,10 @@ and the bottom (horizontal) buttons are:
522522

523523
As the buttons in the bottom list will change according the mode and other
524524
influences, the hardware buttons will activate different functions, and you
525-
don't have to take care about switching functions around in hal, because that
525+
don't have to take care about switching functions around in HAL, because that
526526
is done completely by gmoccapy!
527527

528-
for a 3 axis XYZ machine the hal pin will react as follows:
528+
for a 3 axis XYZ machine the HAL pin will react as follows:
529529

530530
in manual mode:
531531

@@ -573,11 +573,11 @@ in settings mode:
573573
* gmoccapy.h-button.button-2 ==
574574
* gmoccapy.h-button.button-3 ==
575575
* gmoccapy.h-button.button-4 == open classic ladder
576-
* gmoccapy.h-button.button-5 == open hal scope
577-
* gmoccapy.h-button.button-6 == open hal status
578-
* gmoccapy.h-button.button-7 == open hal meter
579-
* gmoccapy.h-button.button-8 == open hal calibration
580-
* gmoccapy.h-button.button-9 == open hal show
576+
* gmoccapy.h-button.button-5 == open HAL scope
577+
* gmoccapy.h-button.button-6 == open HAL status
578+
* gmoccapy.h-button.button-7 == open HAL meter
579+
* gmoccapy.h-button.button-8 == open HAL calibration
580+
* gmoccapy.h-button.button-9 == open HAL show
581581

582582
in homing mode:
583583

@@ -644,7 +644,7 @@ in select file mode:
644644
* gmoccapy.h-button.button-8 ==
645645
* gmoccapy.h-button.button-9 == back
646646

647-
*So we have 67 reactions with only 10 hal pin!*
647+
*So we have 67 reactions with only 10 HAL pin!*
648648

649649
These pins are made available to be able to use the screen without an touch
650650
panel, or protect it from excessive use by placing hardware buttons around
@@ -657,7 +657,7 @@ image::images/gmoccapy_0_9_7_sim_hardware_button.png[align="left"]
657657
All sliders from gmoccapy can be connected to hardware encoder or hardware potentiometers.
658658

659659
[NOTE]
660-
for gmoccapy 3 the hal pin name has changed, as new controls has been implemented,
660+
for gmoccapy 3 the HAL pin name has changed, as new controls has been implemented,
661661
max velocity does not exist any more, as rapid override has been implemented.
662662
This change has been done as many user ask for that.
663663

@@ -678,7 +678,7 @@ To connect 'encoders' the following pin are exported:
678678
| gmoccapy.rapid.rapid-override.count-enable | HAL_BIT | Must be True, to enable counts
679679
|====
680680

681-
To connect 'potentiometers', use the following hal pin:
681+
To connect 'potentiometers', use the following HAL pin:
682682

683683
[{pin_tab_options}]
684684
|====
@@ -693,7 +693,7 @@ To connect 'potentiometers', use the following hal pin:
693693
| gmoccapy.rapid.rapid-override.analog-enable | HAL_BIT | Must be True, to allow analog inputs
694694
|====
695695

696-
In addition gmoccapy 3 offers additional hal pin to control the new slider widgets with momentary switches.
696+
In addition gmoccapy 3 offers additional HAL pin to control the new slider widgets with momentary switches.
697697
The values how fast the increase or decrease will be, must be set in the glade file.
698698
In a future release it will be integrated in the settings page.
699699

@@ -732,13 +732,13 @@ you want to set the slider value.
732732
[WARNING]
733733
If you use both connection types, do not connect the same slider to
734734
both pin, as the influences between the two has not been tested! Different
735-
sliders may be connected to the one or other hal connection type.
735+
sliders may be connected to the one or other HAL connection type.
736736

737737
[IMPORTANT]
738738
Please be aware, jog velocity depends on the turtle button state,
739739
it will lead to different slider scales depending on the mode
740740
(turtle or rabbit). Please take also a look to
741-
<<gmoccapy:jog-velocity,jog velocities and turtle-jog hal pin>> for more
741+
<<gmoccapy:jog-velocity,jog velocities and turtle-jog HAL pin>> for more
742742
details.
743743

744744
.Example
@@ -759,9 +759,9 @@ All axis given in the INI File have a jog-plus and a jog-minus pin, so
759759
hardware momentary switches can be used to jog the axis.
760760

761761
[NOTE]
762-
naming of this hal pin has changed for gmoccapy2
762+
naming of this HAL pin has changed for gmoccapy2
763763

764-
For the standard XYZ config following hal Pin will be available:
764+
For the standard XYZ config following HAL Pin will be available:
765765

766766
* gmoccapy.jog.axis.jog-x-plus
767767
* gmoccapy.jog.axis.jog-x-minus
@@ -793,19 +793,19 @@ divider can be set on the <<gmoccapy:turtle-jog,settings page>>.
793793

794794
So using a touch screen it is much easier to select smaller velocities.
795795

796-
gmoccapy offers a hal pin to toggle between turtle and rabbit jogging
796+
gmoccapy offers a HAL pin to toggle between turtle and rabbit jogging
797797

798798
* gmoccapy.jog.turtle-jog (Hal Bit In)
799799

800800
=== Jog Increment Hal Pins
801801

802-
The jog increments are selectable through hal pins, so a selection hardware
802+
The jog increments are selectable through HAL pins, so a selection hardware
803803
switch can be used to select the increment to use. There will be a maximum
804-
of 10 hal pin for the increments given in the INI File, if you give more
804+
of 10 HAL pin for the increments given in the INI File, if you give more
805805
increments in your INI File, they will be not reachable from the GUI as they
806806
will not be displayed.
807807

808-
If you have 6 increments in your hal you will get *7* pins:
808+
If you have 6 increments in your HAL you will get *7* pins:
809809
jog-inc-0 is unchangeable and will represent continuous jogging.
810810

811811
* gmoccapy.jog.jog-inc-0
@@ -816,7 +816,7 @@ jog-inc-0 is unchangeable and will represent continuous jogging.
816816
* gmoccapy.jog.jog-inc-5
817817
* gmoccapy.jog.jog-inc-6
818818

819-
gmoccapy offers also a hal pint to output the selected jog invrement
819+
gmoccapy offers also a HAL pint to output the selected jog invrement
820820

821821
* gmoccapy.jog.jog-increment
822822

@@ -944,7 +944,7 @@ net tool-prep-loop iocontrol.0.tool-prepare <= iocontrol.0.tool-prepared
944944
----
945945

946946
[NOTE]
947-
Please take care, that this connections have to be done in the postgui hal file!
947+
Please take care, that this connections have to be done in the postgui HAL file!
948948

949949
.Tool Offset Pins
950950
These pins allow you to show the active tool offset values for X and Z in the
@@ -956,7 +956,7 @@ image::images/gmoccapy_0_9_7_tool_info.png["Tool information",align="left"]
956956
* gmoccapy.tooloffset-z
957957

958958
[NOTE]
959-
Please take care, that this connections have to be done in the postgui hal file!
959+
Please take care, that this connections have to be done in the postgui HAL file!
960960

961961
[NOTE]
962962
the tooloffset-x line is not needed on a mill,
@@ -979,7 +979,7 @@ each tool change!
979979

980980
Gmoccapy offers an integrated auto tool measurement. To use this feature, you
981981
will need to do some additional settings and you may want to use the
982-
offered hal pin to get values in your own ngc remap procedure.
982+
offered HAL pin to get values in your own ngc remap procedure.
983983

984984
[IMPORTANT]
985985
Before starting the first test, do not forget to enter the probe
@@ -1113,7 +1113,7 @@ You may want to modify this file to fit more your needs.
11131113

11141114
=== Needed Hal Connections
11151115

1116-
Connect the tool probe in your hal file like so:
1116+
Connect the tool probe in your HAL file like so:
11171117

11181118
[source,{hal}]
11191119
----
@@ -1356,8 +1356,8 @@ image::images/gmoccapy_settings_hardware.png["Hardware settings",align="left"]
13561356
==== Hardware MPG Scales
13571357

13581358
For the different Hal Pin to connect MPG Wheels to, you may select individual scales to be applied.
1359-
The main reason for this was my own test to solve this through hal connections, resulting in a very
1360-
complex hal file. Imagine a user having an MPG Wheel with 100 ipr and he wants to slow down the max
1359+
The main reason for this was my own test to solve this through HAL connections, resulting in a very
1360+
complex HAL file. Imagine a user having an MPG Wheel with 100 ipr and he wants to slow down the max
13611361
vel from 14000 to 2000 mm/min, that needs 12000 impulses, resulting in 120 turns of the wheel!
13621362
Or an other user having a MPG Wheel with 500 ipr and he wants to set the spindle override witch has
13631363
limits from 50 to 120 % so he goes from min to max within 70 impulses, meaning not even 1/4 turn.
@@ -1411,7 +1411,7 @@ There are three options to unlock the settings page:
14111411

14121412
* use unlock code (the user must give a code to get in)
14131413
* Do not use unlock code (There will be no security check)
1414-
* Use hal pin to unlock (hardware pin must be high to unlock the settings,
1414+
* Use HAL pin to unlock (hardware pin must be high to unlock the settings,
14151415
see <<gmoccapy:hardware-unlock, hardware unlock pin>>
14161416

14171417
Default is use unlock code (default = *123*)
@@ -1450,7 +1450,7 @@ This settings will have influence on the jog velocities.
14501450
if in turtle mode (button pressed, showing the turtle)
14511451

14521452
[NOTE]
1453-
This button can be activated using the <<gmoccapy:jog-velocity,turtle-jog>> hal pin.
1453+
This button can be activated using the <<gmoccapy:jog-velocity,turtle-jog>> HAL pin.
14541454

14551455
[[gmoccapy:tool-measurement]]
14561456
=== Advanced Settings

0 commit comments

Comments
 (0)