Skip to content

Commit af6f62e

Browse files
committed
configs: remove conflicting duplicate INI keys (first occurrence wins)
LinuxCNC's INI reader returns the first occurrence of a key within a section (IniFile::findTag with num=1), so a second line with the same key in the same section is silently ignored. Several shipped sim/demo configs contain such duplicates where the later value is dead -- in a couple of cases masking the author's evident intent. The first-wins behaviour was confirmed on 2.10 with `inivar` and the linuxcnc.ini Python reader. - sim/axis/gladevcp/probe.ini: [RS274NGC] SUBROUTINE_PATH was set twice, so the second value (../../nc_files/gladevcp_lib -- the gladevcp demo's O-word subs) was ignored and those subs were unreachable. Merge both into one colon-separated SUBROUTINE_PATH. - sim/woodpecker/woodpecker_xyzab.ini: [DISPLAY] GEOMETRY = xyzab (added for this 5-axis variant) was overridden by a leftover XYZABCUVW; make xyzab effective. Also drop a duplicate [RS274NGC] PARAMETER_FILE. - sim/woodpecker/woodpecker_xyza.ini: drop a pasted-twice spindle-override block ([DISPLAY] MIN/MAX_SPINDLE_0_OVERRIDE). - sim/axis/histogram_demo.ini, ini_hal_demo.ini: drop a stray second [TRAJ] MAX_LINEAR_VELOCITY (1.2345) after 1.2. - sim/axis/vismach/5axis/bridgemill/5axis.ini: drop a redundant [TRAJ] MAX_ANGULAR_VELOCITY (360, identical to 360.0).
1 parent 7351e0e commit af6f62e

6 files changed

Lines changed: 5 additions & 11 deletions

File tree

configs/sim/axis/gladevcp/probe.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ jpg = image-to-gcode
3030
py = python3
3131

3232
[RS274NGC]
33-
SUBROUTINE_PATH= .
33+
# '.' plus the gladevcp Demo specific Oword subs dir. These must be a single
34+
# colon-separated SUBROUTINE_PATH: LinuxCNC reads only the first occurrence of
35+
# an INI key, so a second SUBROUTINE_PATH line is silently ignored.
36+
SUBROUTINE_PATH = .:../../nc_files/gladevcp_lib
3437
PARAMETER_FILE = sim.var
35-
# gladevcp Demo specific Oword subs live here
36-
SUBROUTINE_PATH = ../../nc_files/gladevcp_lib
3738

3839
[EMCMOT]
3940
EMCMOT = motmod

configs/sim/axis/histogram_demo.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ LINEAR_UNITS = inch
5555
ANGULAR_UNITS = degree
5656
DEFAULT_LINEAR_VELOCITY = 1.2
5757
MAX_LINEAR_VELOCITY = 1.2
58-
MAX_LINEAR_VELOCITY = 1.2345
5958

6059
[EMCIO]
6160
TOOL_TABLE = sim.tbl

configs/sim/axis/ini_hal_demo.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ LINEAR_UNITS = inch
5858
ANGULAR_UNITS = degree
5959
DEFAULT_LINEAR_VELOCITY = 1.2
6060
MAX_LINEAR_VELOCITY = 1.2
61-
MAX_LINEAR_VELOCITY = 1.2345
6261

6362
[EMCIO]
6463
TOOL_TABLE = sim.tbl

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ DEFAULT_LINEAR_VELOCITY = 200.0
6262
MAX_LINEAR_VELOCITY = 346.0
6363
MAX_LINEAR_ACCELERATION = 800.0
6464
DEFAULT_LINEAR_ACCELERATION = 800.0
65-
MAX_ANGULAR_VELOCITY = 360
6665

6766
[EMCIO]
6867
TOOL_TABLE = 5axis.tbl

configs/sim/woodpecker/woodpecker_xyza.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ DEFAULT_SPINDLE_0_SPEED = 12000
2121
SPINDLE_INCREMENT = 200
2222
MIN_SPINDLE_0_SPEED = 1000
2323
MAX_SPINDLE_0_SPEED = 20000
24-
MIN_SPINDLE_0_OVERRIDE = 0.5
25-
MAX_SPINDLE_0_OVERRIDE = 1.5
2624
# linear
2725
MIN_LINEAR_VELOCITY = 0
2826
MAX_LINEAR_VELOCITY = 60.00

configs/sim/woodpecker/woodpecker_xyzab.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DISPLAY = qtvcp -f woodpecker
1111
PREFERENCE_FILE_PATH = WORKINGFOLDER/woodpecker.pref
1212
POSITION_OFFSET = RELATIVE
1313
POSITION_FEEDBACK = ACTUAL
14-
GEOMETRY = XYZABCUVW
14+
GEOMETRY = xyzab
1515
GRIDS = 10mm 20mm 50mm 100mm 1in 2in 5in 10in
1616
MAX_FEED_OVERRIDE = 1.2
1717
#spindle
@@ -47,7 +47,6 @@ MACHINE_LOG_PATH = machine_log.dat
4747
LOG_FILE = woodpecker.log
4848
TOOL_EDITOR = tooledit
4949
CONFIRM_EXIT = True
50-
GEOMETRY = xyzab
5150

5251
MACRO = auto_tool_zero auto_tool_zero
5352
MACRO = go_to_zero go_to_zero
@@ -81,7 +80,6 @@ TOOL_TABLE = tool.tbl
8180
PARAMETER_FILE = woodpecker.var
8281
RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
8382
SUBROUTINE_PATH = /home/.../linuxcnc/nc_files/probe/basic_probe/macros:~/linuxcnc/nc_files/examples/ngcgui_lib:~/linuxcnc/nc_files/examples/ngcgui_lib/utilitysubs
84-
PARAMETER_FILE = metric_parameters.txt
8583
FEATURES=12
8684

8785
[EMCMOT]

0 commit comments

Comments
 (0)