Merge pull request #4092 from PeterStolz/fix-conflicting-duplicate-ini-keys

andypugh · web-flow · commit 3cd702c6906c · 2026-06-03T13:52:20.000+01:00
configs: remove duplicate INI keys (first occurrence wins)
diff --git a/configs/sim/axis/gantry/gantry.ini b/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
diff --git a/configs/sim/axis/gantry/gantry_jjog.ini b/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
diff --git a/configs/sim/axis/gladevcp/probe.ini b/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
diff --git a/configs/sim/axis/histogram_demo.ini b/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
diff --git a/configs/sim/axis/ini_hal_demo.ini b/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
diff --git a/configs/sim/axis/vismach/5axis/bridgemill/5axis.ini b/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
diff --git a/configs/sim/axis/vismach/scara/scara.ini b/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
diff --git a/configs/sim/qtaxis/gantry/qt_gantry.ini b/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
diff --git a/configs/sim/qtaxis/non-trivial/scara/scara.ini b/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
diff --git a/configs/sim/qtvcp_screens/non-trivial/scara/scara.ini b/configs/sim/qtvcp_screens/non-trivial/scara/scara.ini
@@ -70,7 +70,6 @@ py = python
 
 [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
diff --git a/configs/sim/qtvcp_screens/qt_gantry.ini b/configs/sim/qtvcp_screens/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
diff --git a/configs/sim/qtvcp_screens/qtdefault_gantry.ini b/configs/sim/qtvcp_screens/qtdefault_gantry.ini
@@ -76,7 +76,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
diff --git a/configs/sim/woodpecker/woodpecker_xyza.ini b/configs/sim/woodpecker/woodpecker_xyza.ini
@@ -21,8 +21,6 @@ DEFAULT_SPINDLE_0_SPEED = 12000
 SPINDLE_INCREMENT = 200
 MIN_SPINDLE_0_SPEED = 1000
 MAX_SPINDLE_0_SPEED = 20000
-MIN_SPINDLE_0_OVERRIDE =  0.5
-MAX_SPINDLE_0_OVERRIDE =  1.5
 # linear
 MIN_LINEAR_VELOCITY     = 0
 MAX_LINEAR_VELOCITY     = 60.00
diff --git a/configs/sim/woodpecker/woodpecker_xyzab.ini b/configs/sim/woodpecker/woodpecker_xyzab.ini
@@ -11,7 +11,7 @@ DISPLAY = qtvcp -f woodpecker
 PREFERENCE_FILE_PATH = WORKINGFOLDER/woodpecker.pref
 POSITION_OFFSET = RELATIVE
 POSITION_FEEDBACK = ACTUAL
-GEOMETRY = XYZABCUVW
+GEOMETRY = XYZAB
 GRIDS = 10mm 20mm 50mm 100mm 1in 2in 5in 10in
 MAX_FEED_OVERRIDE  = 1.2
 #spindle
@@ -47,7 +47,6 @@ MACHINE_LOG_PATH = machine_log.dat
 LOG_FILE = woodpecker.log
 TOOL_EDITOR = tooledit
 CONFIRM_EXIT = True
-GEOMETRY = xyzab
 
 MACRO = auto_tool_zero auto_tool_zero
 MACRO = go_to_zero go_to_zero
@@ -81,7 +80,6 @@ TOOL_TABLE = tool.tbl
 PARAMETER_FILE = woodpecker.var
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 SUBROUTINE_PATH = /home/.../linuxcnc/nc_files/probe/basic_probe/macros:~/linuxcnc/nc_files/examples/ngcgui_lib:~/linuxcnc/nc_files/examples/ngcgui_lib/utilitysubs
-PARAMETER_FILE  = metric_parameters.txt
 FEATURES=12
 
 [EMCMOT]
