Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/abort/feed-rate/test.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
VERSION = 1.1

#DEBUG = 0x0
DEBUG = 0xffffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ./test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/abort/on_abort_command-crazy-move/test.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
# DEBUG = 0
DEBUG = 2147483647
DEBUG = 0x05400d01
VERSION = 1.1

[DISPLAY]
Expand Down
2 changes: 1 addition & 1 deletion tests/halui/jogging/halui.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[EMC]
DEBUG = 0x7fffffff
DEBUG = 0x05400d01
VERSION = 1.1

[DISPLAY]
Expand Down
2 changes: 1 addition & 1 deletion tests/halui/mdi/halui.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
VERSION = 1.1
DEBUG = 0x7fffffff
DEBUG = 0x05400d01

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0x05400d01 decodes exactly onto the libnml PRINT_* names with no leftover bits: PRINT_RCS_ERRORS|PRINT_COMMANDS_RECEIVED|PRINT_STATUS_RECEIVED|PRINT_STATUS_SENT|PRINT_RPC_SERVER_CALL|PRINT_SOCKET_CONNECT|PRINT_SERVER_SUBSCRIPTION_ACTIVITY (src/libnml/rcs/rcs_print.hh:100-125). Was it meant for RCS_DEBUG rather than [EMC]DEBUG?

As EMC_DEBUG_* (src/emc/nml_intf/debugflags.h:24-45) it is EMC_DEBUG_INTERP|EMC_DEBUG_INTERP_LIST plus five undefined bits (0x1, 0x400, 0x400000, 0x1000000, 0x4000000), and it clears EMC_DEBUG_TASK_ISSUE (0x10), which gates Issuing %s -- (%s) (emctaskmain.cc:1645-1646), mdi_execute_hook: MDI command '%s' done (emctaskmain.cc:683-685) and error executing command %d:%s (emctaskmain.cc:2420-2421).


[DISPLAY]
DISPLAY = ./test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/hard-limits/hard-limits.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ VERSION = 1.1

MACHINE = hard-limits
#DEBUG = 0
DEBUG = 0x7fffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ./test-ui.py
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[RS274NGC]
DISABLE_FANUC_STYLE_SUB = 1
[EMC]
DEBUG = 2147483647
DEBUG = 0x05400d01
2 changes: 1 addition & 1 deletion tests/interp/mdi-oword-m66/interp.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
VERSION = 1.1
DEBUG = 0xffffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ./test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/interp/subroutine-return/interp.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[EMC]
DEBUG = 0xffffffff
DEBUG = 0x05400d01
VERSION = 1.1

[DISPLAY]
Expand Down
2 changes: 1 addition & 1 deletion tests/io-startup/nonrandom/test.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[EMC]
# The version string for this INI file.
VERSION = 1.1
DEBUG = 0x7fffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ../../test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/io-startup/random/test.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
VERSION = 1.1
DEBUG = 0x7fffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ../../test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/lathe/lathe.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[EMC]
# The version string for this INI file.
VERSION = 1.1
DEBUG = 0x7fffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ./test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/linuxcncrsh-tcp/linuxcncrsh-test.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
VERSION = 1.1
DEBUG = 0x7FFFFFFF
DEBUG = 0x05400d01
RCS_DEBUG = 0xEF67FFFF

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RCS_DEBUG is parsed after the DEBUG-derived flags and clears them first (emctaskmain.cc:3126-3131, shcom.cc:990-995), so this test's NML output is unchanged by the edit.

NML_FILE = tcp.nml

Expand Down
2 changes: 1 addition & 1 deletion tests/matrixkins/test.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
VERSION = 1.1

#DEBUG = 0x0
DEBUG = 0xffffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ./test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/mdi-queue-length/test.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
VERSION = 1.1
DEBUG = 0xffffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ./test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/mdi-queue/linuxcncrsh-test.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[EMC]
DEBUG = 0x7FFFFFFF
DEBUG = 0x05400d01
VERSION = 1.1
#DEBUG = 0

Expand Down
2 changes: 1 addition & 1 deletion tests/motion-logger/mountaindew/mountaindew.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
VERSION = 1.1
DEBUG = 0xffffffff
DEBUG = 0x05400d01

[DISPLAY]
DISPLAY = ./test-ui.py
Expand Down
2 changes: 1 addition & 1 deletion tests/motion/g0/motion-test.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ VERSION = 1.1
MACHINE = MOTION-TEST

# Debug level, 0 means no messages. See src/emc/nml_int/emcglb.h for others
DEBUG = 0x7FFFFFFF
DEBUG = 0x05400d01
#DEBUG = 0x10

[DISPLAY]
Expand Down
2 changes: 1 addition & 1 deletion tests/remap/duplicate-o-word/test.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[EMC]
DEBUG=65535
DEBUG=0x05400d01

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only file here with a live LOG_LEVEL ([RS274NGC]LOG_LEVEL=5000, rs274ngc_pre.cc:931), so the only one where interp logging fires. _setup.debugmask comes from [EMC]DEBUG (rs274ngc_pre.cc:927); the old 65535 carried EMC_DEBUG_OWORD (0x2000) and EMC_DEBUG_REMAP (0x4000), gating logOword/logRemap (rs274ngc.hh:69-70, interp_remap.cc:171-173). The new value drops both and keeps EMC_DEBUG_INTERP. In a test called duplicate-o-word, which of the two is the noise?

LOG_LEVEL=5000

[RS274NGC]
Expand Down
2 changes: 1 addition & 1 deletion tests/toolchanger/toolno-pocket-differ/nonrandom/sim.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
#DEBUG = 0
DEBUG = 0x7fffffff
DEBUG = 0x05400d01

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tests/toolchanger/reload-tool/non-random/test.ini and .../random/test.ini are still at DEBUG = 0xffffffff. Grepping ^ *DEBUG *= across tests/, those are the only two all-bits values left after this PR.

VERSION = 1.1

[DISPLAY]
Expand Down
2 changes: 1 addition & 1 deletion tests/toolchanger/toolno-pocket-differ/random/sim.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[EMC]
#DEBUG = 0
DEBUG = 0x7fffffff
DEBUG = 0x05400d01
VERSION = 1.1

[DISPLAY]
Expand Down