diff options
| author | Jeff Epler <jepler@unpythonic.net> | 2012-01-20 17:42:47 -0600 |
|---|---|---|
| committer | Jeff Epler <jepler@unpythonic.net> | 2012-01-21 10:13:36 -0600 |
| commit | b400f53a86fe71e5b260f611745bbb65800db592 (patch) | |
| tree | 52075f60f518eee8738fb39dd04f416ec2120278 | |
| parent | 1173b36fc173233ce9773565327f8f0b048f2d77 (diff) | |
| download | linuxcnc-b400f53a86fe71e5b260f611745bbb65800db592.tar.gz linuxcnc-b400f53a86fe71e5b260f611745bbb65800db592.zip | |
refer to linuxcncrsh
| -rw-r--r-- | docs/src/common/user_intro.txt | 2 | ||||
| -rw-r--r-- | docs/src/common/user_intro_de.txt | 2 | ||||
| -rw-r--r-- | docs/src/common/user_intro_es.txt | 2 | ||||
| -rw-r--r-- | docs/src/common/user_intro_pl.txt | 2 | ||||
| -rw-r--r-- | scripts/linuxcnc.in | 2 | ||||
| -rw-r--r-- | src/hal/utils/halrmt.c | 2 | ||||
| -rw-r--r-- | tests/motion/README | 2 | ||||
| -rw-r--r-- | tests/motion/g0/motion-test.ini | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/docs/src/common/user_intro.txt b/docs/src/common/user_intro.txt index ea68acc52..e15f844e8 100644 --- a/docs/src/common/user_intro.txt +++ b/docs/src/common/user_intro.txt @@ -85,7 +85,7 @@ image::images/keystick.png[] - a HAL based user interface called *halui*, which allows to control LinuxCNC using knobs and switches - - a telnet based user interface called *emcrsh*, which allows commands to + - a telnet based user interface called *linuxcncrsh*, which allows commands to be sent to LinuxCNC from remote computers == Languages diff --git a/docs/src/common/user_intro_de.txt b/docs/src/common/user_intro_de.txt index ea68acc52..e15f844e8 100644 --- a/docs/src/common/user_intro_de.txt +++ b/docs/src/common/user_intro_de.txt @@ -85,7 +85,7 @@ image::images/keystick.png[] - a HAL based user interface called *halui*, which allows to control LinuxCNC using knobs and switches - - a telnet based user interface called *emcrsh*, which allows commands to + - a telnet based user interface called *linuxcncrsh*, which allows commands to be sent to LinuxCNC from remote computers == Languages diff --git a/docs/src/common/user_intro_es.txt b/docs/src/common/user_intro_es.txt index ea68acc52..e15f844e8 100644 --- a/docs/src/common/user_intro_es.txt +++ b/docs/src/common/user_intro_es.txt @@ -85,7 +85,7 @@ image::images/keystick.png[] - a HAL based user interface called *halui*, which allows to control LinuxCNC using knobs and switches - - a telnet based user interface called *emcrsh*, which allows commands to + - a telnet based user interface called *linuxcncrsh*, which allows commands to be sent to LinuxCNC from remote computers == Languages diff --git a/docs/src/common/user_intro_pl.txt b/docs/src/common/user_intro_pl.txt index ea68acc52..e15f844e8 100644 --- a/docs/src/common/user_intro_pl.txt +++ b/docs/src/common/user_intro_pl.txt @@ -85,7 +85,7 @@ image::images/keystick.png[] - a HAL based user interface called *halui*, which allows to control LinuxCNC using knobs and switches - - a telnet based user interface called *emcrsh*, which allows commands to + - a telnet based user interface called *linuxcncrsh*, which allows commands to be sent to LinuxCNC from remote computers == Languages diff --git a/scripts/linuxcnc.in b/scripts/linuxcnc.in index b1ee9ff3e..d38372e87 100644 --- a/scripts/linuxcnc.in +++ b/scripts/linuxcnc.in @@ -430,7 +430,7 @@ function Cleanup() { echo "Shutting down and cleaning up LinuxCNC..." # Kill displays first - that should cause an orderly # shutdown of the rest of emc2 - for KILL_TASK in xemc yemc emcpanel keystick iosh emcsh emcrsh linuxcnctop mdi debuglevel; do + for KILL_TASK in xemc yemc emcpanel keystick iosh emcsh linuxcncrsh linuxcnctop mdi debuglevel; do if $PIDOF $KILL_TASK >>$DEBUG_FILE ; then KillTaskWithTimeout fi diff --git a/src/hal/utils/halrmt.c b/src/hal/utils/halrmt.c index f121cff54..49622af2a 100644 --- a/src/hal/utils/halrmt.c +++ b/src/hal/utils/halrmt.c @@ -23,7 +23,7 @@ --enablepw <password> --sessions <max sessions> -ini<inifile>} With -- --port Waits for socket connections (Telnet) on specified socket, without port - uses default port 5006. (note: emcrsh uses 5007 as default) + uses default port 5006. (note: linuxcncrsh uses 5007 as default) With -- --name <server name> Sets the server name to specified name for Hello. With -- --connectpw <password> Sets the connection password to 'password'. Default EMC With -- --enablepw <password> Sets the enable password to 'password'. Default EMCTOO diff --git a/tests/motion/README b/tests/motion/README index 06750a059..785967894 100644 --- a/tests/motion/README +++ b/tests/motion/README @@ -1,5 +1,5 @@ -The "motion" tests start a full emc in sim mode, with emcrsh as the UI. +The "motion" tests start a full emc in sim mode, with linuxcncrsh as the UI. They run g-code programs and use halsampler to monitor the motions that motmod emits to HAL. diff --git a/tests/motion/g0/motion-test.ini b/tests/motion/g0/motion-test.ini index 108701f18..0c9e9151c 100644 --- a/tests/motion/g0/motion-test.ini +++ b/tests/motion/g0/motion-test.ini @@ -11,7 +11,7 @@ DEBUG = 0x7FFFFFFF [DISPLAY] -DISPLAY = emcrsh +DISPLAY = linuxcncrsh #PROGRAM_PREFIX = /home/seb/emc2/nc_files |