Merge branch 'master' into fix_g52_g92_reset_on_m2

Author: Sigma1912

.gitignore

@@ -12,9 +12,7 @@ build-stamp
 *.cmd
 .tmp*
 src/*.mod
-# Ignore generated html files, 
-/docs/src/*/*.html
-# docs/html/.gitignore is for the html directory
+# Documentation-tree ignores live in docs/.gitignore.
 debian/*.debhelper.log
 rtlib/Module.symvers
 share/*/*.desktop
@@ -26,8 +24,6 @@ share/linuxcnc/mesa_modbus.c.tmpl
 src/modules.order
 /configs/*/emc.nml
 !/configs/common/emc.nml
-/docs/src/source-highlight/local
-docs/src/*/gui/gmoccapy_release_notes.txt
 lib/python/gremlin.py
 lib/python/qt5_graphics.py
 lib/python/touchy

configs/sim/axis/gantry/gantry.ini

@@ -75,7 +75,6 @@ LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 DEFAULT_LINEAR_VELOCITY = 1.0
 MAX_LINEAR_VELOCITY = 58
-MAX_LINEAR_VELOCITY = 58
 
 [EMCIO]
 TOOL_TABLE = sim.tbl

configs/sim/axis/gantry/gantry_jjog.ini

@@ -80,7 +80,6 @@ LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 DEFAULT_LINEAR_VELOCITY = 1.0
 MAX_LINEAR_VELOCITY = 58
-MAX_LINEAR_VELOCITY = 58
 
 [EMCIO]
 TOOL_TABLE = sim.tbl

configs/sim/axis/gladevcp/probe.ini

@@ -30,10 +30,11 @@ jpg = image-to-gcode
 py = python3
 
 [RS274NGC]
-SUBROUTINE_PATH= .
+# '.' plus the gladevcp Demo specific Oword subs dir. These must be a single
+# colon-separated SUBROUTINE_PATH: LinuxCNC reads only the first occurrence of
+# an INI key, so a second SUBROUTINE_PATH line is silently ignored.
+SUBROUTINE_PATH = .:../../nc_files/gladevcp_lib
 PARAMETER_FILE = sim.var
-# gladevcp Demo specific Oword subs live here
-SUBROUTINE_PATH = ../../nc_files/gladevcp_lib
 
 [EMCMOT]
 EMCMOT = motmod

configs/sim/axis/histogram_demo.ini

@@ -55,7 +55,6 @@ LINEAR_UNITS        = inch
 ANGULAR_UNITS       = degree
 DEFAULT_LINEAR_VELOCITY = 1.2
 MAX_LINEAR_VELOCITY = 1.2
-MAX_LINEAR_VELOCITY = 1.2345
 
 [EMCIO]
 TOOL_TABLE           = sim.tbl

configs/sim/axis/ini_hal_demo.ini

@@ -58,7 +58,6 @@ LINEAR_UNITS        = inch
 ANGULAR_UNITS       = degree
 DEFAULT_LINEAR_VELOCITY = 1.2
 MAX_LINEAR_VELOCITY = 1.2
-MAX_LINEAR_VELOCITY = 1.2345
 
 [EMCIO]
 TOOL_TABLE           = sim.tbl

configs/sim/axis/vismach/5axis/bridgemill/5axis.ini

@@ -8,7 +8,6 @@ MACHINE = Sim-5Axis Bridge Mill (xyzbcw)
         OPEN_FILE = ./5axisgui.ngc
        INCREMENTS = 10 mm, 1 mm, .1 mm
          JOG_AXES = XYZC
-         GEOMETRY = XYZCBW
           DISPLAY = axis
        CYCLE_TIME = 0.200
   POSITION_OFFSET = RELATIVE
@@ -62,7 +61,6 @@ DEFAULT_LINEAR_VELOCITY = 200.0
 MAX_LINEAR_VELOCITY = 346.0
 MAX_LINEAR_ACCELERATION = 800.0
 DEFAULT_LINEAR_ACCELERATION = 800.0
-MAX_ANGULAR_VELOCITY = 360
 
 [EMCIO]
 TOOL_TABLE = 5axis.tbl

configs/sim/axis/vismach/scara/scara.ini

@@ -18,7 +18,6 @@ PYVCP = scara.xml
 
 [RS274NGC]
 SUBROUTINE_PATH = ./remap_subs
-   HAL_PIN_VARS = 1
    HAL_PIN_VARS = 1
           REMAP = M428  modalgroup=10  ngc=428remap
           REMAP = M429  modalgroup=10  ngc=429remap

configs/sim/qtaxis/gantry/qt_gantry.ini

@@ -73,7 +73,6 @@ LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 DEFAULT_LINEAR_VELOCITY = 1.0
 MAX_LINEAR_VELOCITY = 58
-MAX_LINEAR_VELOCITY = 58
 
 [EMCIO]
 TOOL_TABLE = sim.tbl

configs/sim/qtaxis/non-trivial/scara/scara.ini

@@ -69,7 +69,6 @@ py = python3
 
 [RS274NGC]
 SUBROUTINE_PATH = ./remap_subs
-   HAL_PIN_VARS = 1
    HAL_PIN_VARS = 1
           REMAP = M428  modalgroup=10  ngc=428remap
           REMAP = M429  modalgroup=10  ngc=429remap