Fixes, GladeVCP consistency.

Author: smoe

docs/src/gui/axis.adoc

@@ -944,7 +944,7 @@ implementation and subject to change during the development cycle.
 The AXIS GUI includes a no-op (placeholder) function named
 'user_hal_pins()'. +
 It is executed just after the .axisrc file is called and
-just before any gladevcp panels / embedded tabs are initialized. +
+just before any GladeVCP panels / embedded tabs are initialized. +
 This function may be implemented
 within a `~/.axisrc` python script or a '[DISPLAY]USER_COMMAND_FILE'
 python script to make custom HAL pins that use the 'axisui.' prefix. +

docs/src/gui/gladevcp.adoc

@@ -179,7 +179,7 @@ and configs/sim/axis/gladevcp/gladevcp_panel.ini.
 === Exploring the User Interface description
 
 The user interface is created with the glade UI editor - to explore
-it, you need to have <<gladevcp:prerequisites, glade installed>>. To
+it, you need to have <<gladevcp:prerequisites,glade installed>>. To
 edit the user interface, run the command
 
 ----
@@ -2659,7 +2659,7 @@ This should set debug to 2 and confirm that your module actually did it.
 
 === Persistent variables in GladeVCP
 
-A annoying aspect of GladeVCP in its earlier form and PyVCP is the
+An annoying aspect of GladeVCP in its earlier form and PyVCP is the
 fact that you may change values and HAL pins through text entry,
 sliders, spin boxes, toggle buttons etc, but their settings are not
 saved and restored at the next run of LinuxCNC - they start at the default
@@ -2986,7 +2986,7 @@ I defined a `hal_spinbutton` widget in glade, and set a default `value` property
 
 - make sure you have the development version of LinuxCNC installed. You
   don't need the axisrc file any more, this was mentioned in the old
-  GladeVcp wiki page.
+  GladeVCP wiki page.
 - run GladeVCP or AXIS from a terminal window. If you get Python errors,
   check whether there's still a +/usr/lib/python2.6/dist-packages/hal.so+
   file lying around besides the newer
@@ -3030,7 +3030,7 @@ arise. For details, see the `keyboard_forward()` function in
 The LinuxCNC Wiki has information on adding custom widgets to GladeVCP.
 link:http://wiki.linuxcnc.org/cgi-bin/wiki.pl?GladeVCP_Custom_Widgets[GladeVCP Custom Widgets]
 
-== Auxiliary Gladevcp Applications
+== Auxiliary GladeVCP Applications
 
 Support is provided for independently installed GladeVCP applications
 that conform to system directory placements as defined by the

docs/src/gui/ngcgui.adoc

@@ -24,7 +24,7 @@ image::images/ngcgui.png[align="center"]
 * 'PYNGCGUI' is an alternate, python implementation of ngcgui.
 * 'PYNGCGUI' can run as a standalone application or can be embedded as
   a tab page (with its own set of multiple subroutine tabs) in any
-  GUI that supports embedding of gladevcp applications axis, touchy, gscreen
+  GUI that supports embedding of GladeVCP applications axis, touchy, gscreen
   and gmoccapy.
 
 Using NGCGUI or PYNGCGUI:
@@ -60,7 +60,7 @@ These examples demonstrate both 3-axis (XYZ) cartesian configurations
 (like mills) and lathe (XZ) setups.  Some examples show the use of a
 pop up keyboard for touch screen systems and other examples demonstrate
 the use of files created for the gcmc (G-code Meta Compiler) application.
-The touchy examples also demonstrate incorporation of a gladevcp back plot
+The touchy examples also demonstrate incorporation of a GladeVCP back plot
 viewer (gremlin_view).
 
 The simplest application is found as:
@@ -333,15 +333,15 @@ that uses the application truetype-tracer.  The truetype-tracer application must
 be installed independently and located in the user PATH.
 ====
 
-=== Embedding PYNGCGUI as a gladevcp tab page in a gui
+=== Embedding PYNGCGUI as a GladeVCP tab page in a gui
 
 The following INI file items go in the [DISPLAY] section for use with the
 axis, gscreen, or touchy guis.  (See additional sections below for additional
 items needed)
 
 .EMBED_ Items
 * `EMBED_TAB_NAME = Pyngcgui` - name to appear on embedded tab
-* `EMBED_TAB_COMMAND = gladevcp -x {XID} pyngcgui_axis.ui` - invokes gladevcp
+* `EMBED_TAB_COMMAND = gladevcp -x {XID} pyngcgui_axis.ui` - invokes GladeVCP
 * `EMBED_TAB_LOCATION = name_of_location` - where the embedded page is located
 
 [NOTE]
@@ -355,7 +355,7 @@ Configuration Chapter.
 
 [NOTE]
 ====
-The truetype tracer gui front-end is not currently available for gladevcp
+The truetype tracer gui front-end is not currently available for GladeVCP
 applications.
 ====
 

docs/src/hal/hal-examples.adoc

@@ -298,7 +298,7 @@ start
 # comment out the following lines while testing and use the interactive
 # option halrun -I -f start.hal to be able to show pins etc.
 
-# wait until the gladevcp GUI named winder terminates
+# wait until the GladeVCP GUI named winder terminates
 waitusr winder
 
 # stop HAL threads

docs/src/motion/switchkins.adoc

@@ -29,7 +29,7 @@ The kinematics type is selected by a motion module HAL pin that
 can be updated from a G-code program or by interactive MDI
 commands. The halui provisions for activating MDI commands can be
 used to allow buttons to select the kinematics type using
-hardware controls or a virtual panel (PyVCP, gladevcp, etc.).
+hardware controls or a virtual panel (PyVCP, GladeVCP, etc.).
 
 When a kinematics type is changed, the G-code must also issue
 commands to *force synchronization* of the interpreter and motion

docs/src/plasma/qtplasmac.adoc

@@ -517,9 +517,11 @@ More information on contact switching load can be seen on page III of link:https
 
 [underline]*Calculations:*
 
-If using a Mesa card, the input resistance of a 7i96 is 4700Ω (always consult the product manual associated with the revision being used as these values sometimes vary between revisions), giving a contact current of 5.1mA assuming a supply voltage of 24V (I = V/R).
+If using a Mesa card, the input resistance of a 7i96 is 4700 Ω (always consult the product manual associated with the revision being used as these values sometimes vary between revisions), giving a contact current of 5.1 mA assuming a supply voltage of 24 V (I = V/R).
 
-As an example, the typical relay used in a Hypertherm Powermax 65 plasma cutter (link:https://www.te.com/commerce/DocumentDelivery/DDEController?Action=showdoc&DocId=Data+Sheet%7F1308242_T77%7F1011%7Fpdf%7FEnglish%7FENG_DS_1308242_T77_1011.pdf%7F1-1393194-0[TE T77S1D10-24]) requires a minimum contact load of 100mA @ 5VDC which will dissipate 0.5W (P = I * V). If using a 24VDC power supply this would then equate to a minimum current of 20.8mA. Because there is less current drawn by the Mesa input than is required by the relay there needs to be an increase in the current.
+As an example, the typical relay used in a Hypertherm Powermax 65 plasma cutter (link:https://www.te.com/commerce/DocumentDelivery/DDEController?Action=showdoc&DocId=Data+Sheet%7F1308242_T77%7F1011%7Fpdf%7FEnglish%7FENG_DS_1308242_T77_1011.pdf%7F1-1393194-0[TE T77S1D10-24]) requires a minimum contact load of 100 mA @ 5 VDC which will dissipate 0.5 W (P = I * V).
+If using a 24 VDC power supply this would then equate to a minimum current of 20.8 mA.
+Because there is less current drawn by the Mesa input than is required by the relay there needs to be an increase in the current.
 
 The resistance can be calculated using R = Vs / (Im - Ii) where:
 
@@ -528,7 +530,8 @@ The resistance can be calculated using R = Vs / (Im - Ii) where:
 - Im = minimum current required
 - Ii = input current
 
-Using a 7i96 with an input current of 5.1mA gives a calculated value of 1529Ω. (24 / (.0208 - .0051)). This could then be rounded down to a commonly available 1500Ω resistor giving a small safety margin.
+Using a 7i96 with an input current of 5.1 mA gives a calculated value of 1529 Ω. (24 / (.0208 - .0051)).
+This could then be rounded down to a commonly available 1500 Ω resistor giving a small safety margin.
 
 The power dissipation can by calculated using P = Vs^2^ / Rs where:
 
@@ -1747,7 +1750,7 @@ The maximum percentage allowed is 100%, values above this will be set to 100%.
 
 If the user intends to use this feature it would be prudent to add *M68 E3 Q0* to both the preamble and postamble of the G-code program so the machine starts and ends in a known state.
 
-IMPORTANT: *G-cODE THC* AND *VELOCITY BASED THC* ARE NOT ABLE TO BE USED IF *CUTTER COMPENSATION* IS IN EFFECT; AN ERROR MESSAGE WILL BE DISPLAYED.
+IMPORTANT: *G-CODE THC* AND *VELOCITY BASED THC* ARE NOT ABLE TO BE USED IF *CUTTER COMPENSATION* IS IN EFFECT; AN ERROR MESSAGE WILL BE DISPLAYED.
 
 WARNING: If Cut Feed Rate in the MATERIAL section of the <<qt_parameters-tab, PARAMETERS Tab>> is set to Zero then QtPlasmaC will use *motion.requested-velocity* (as set by a standard Feedrate call in the G-code) for the THC calculations. This is not recommended as it is not a reliable way of implementing velocity based THC.
 
@@ -1805,7 +1808,7 @@ To use cutter compensation the user will need to use G41.1, G42.1 and G40 with t
 * *G42.1 D#<_hal[plasmac_run.kerf-width-f]>* : offsets torch to the right of the programmed path
 * *G40* turns the cutter compensation off
 
-IMPORTANT: IF *CUTTER COMPENSATION* IS IN EFFECT *G-cODE THC*, *VELOCITY BASED THC* AND *OVER CUT* ARE NOT ABLE TO BE USED; AN ERROR MESSAGE WILL BE DISPLAYED.
+IMPORTANT: IF *CUTTER COMPENSATION* IS IN EFFECT *G-CODE THC*, *VELOCITY BASED THC* AND *OVER CUT* ARE NOT ABLE TO BE USED; AN ERROR MESSAGE WILL BE DISPLAYED.
 
 [[qt_ihs-skip]]
 === Initial Height Sense (IHS) Skip