Skip to content

Commit

Permalink
Rename many user visible parts to "linuxcnc"
Browse files Browse the repository at this point in the history
this includes the main script, some of the GUIs, the Python module,
the Tcl package, some image fies.

On a sim system, axis, tkemc, xemc all start.  runtests pass.

a system with realtime wasn't yet tested.

packaging probably requires additional changes and was not yet tested.
  • Loading branch information
jepler committed Jan 18, 2012
1 parent 402b6cd commit 51fc09f
Show file tree
Hide file tree
Showing 218 changed files with 735 additions and 733 deletions.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@ In the source directory, build EMC2:

to run the software go back to the top level directory, and issue:

. scripts/emc-environment
. scripts/rip-environment
emc
2 changes: 1 addition & 1 deletion configs/5axis/5axis.ini
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = ../../nc_files/

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5
EDITOR = gedit

Expand Down
4 changes: 2 additions & 2 deletions configs/Sherline3Axis/Sherline3Axis_inch.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DISPLAY = axis
CYCLE_TIME = 0.200

#- Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

#- Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 1.2
PROGRAM_PREFIX = ../../nc_files/

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5


Expand Down
4 changes: 2 additions & 2 deletions configs/Sherline3Axis/Sherline3Axis_mm.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DISPLAY = axis
CYCLE_TIME = 0.200

#- Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

#- Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 1.2
PROGRAM_PREFIX = ../../nc_files

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5


Expand Down
2 changes: 1 addition & 1 deletion configs/Sherline4Axis/Sherline4Axis_inch.ini
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 1.20
PROGRAM_PREFIX = ../../nc_files

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

GEOMETRY = AXYZ
Expand Down
2 changes: 1 addition & 1 deletion configs/Sherline4Axis/Sherline4Axis_mm.ini
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 1.20
PROGRAM_PREFIX = ../../nc_files

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

GEOMETRY = AXYZ
Expand Down
4 changes: 2 additions & 2 deletions configs/SherlineLathe/SherlineLathe_inch.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DISPLAY = axis
CYCLE_TIME = 0.200
LATHE = 1
#- Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

#- Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 1.2
PROGRAM_PREFIX = ../../nc_files

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5


Expand Down
4 changes: 2 additions & 2 deletions configs/SherlineLathe/SherlineLathe_mm.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DISPLAY = axis
CYCLE_TIME = 0.200
LATHE = 1
#- Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

#- Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 1.2
PROGRAM_PREFIX = ../../nc_files

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5


Expand Down
4 changes: 2 additions & 2 deletions configs/boss/boss.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ DISPLAY = tkemc
CYCLE_TIME = 0.0500

# Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

# Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -44,7 +44,7 @@ MAX_FEED_OVERRIDE = 1.5
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions configs/boss/pid_test.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ DISPLAY = tkemc
CYCLE_TIME = 0.0500

# Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

# Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -44,7 +44,7 @@ MAX_FEED_OVERRIDE = 1.5
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/classicladder/cl-estop/cl-estop.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ EDITOR = gedit
POSITION_OFFSET = RELATIVE
POSITION_FEEDBACK = ACTUAL
MAX_FEED_OVERRIDE = 1.2
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5
PROGRAM_PREFIX = /home/jet/emc2/nc_files
INCREMENTS = .1in .05in .01in .005in .001in .0005in .0001in
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Basic540_3axes.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Basic540_4axes.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Uni-cnc-set.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MAX_FEED_OVERRIDE = 10.0
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Uni-dreh-g.ini
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = /usr/share/emc/nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Uni-dreh.ini
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Uni-fraes-4.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MAX_FEED_OVERRIDE = 10.0
PROGRAM_PREFIX = /usr/share/emc/nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Uni-fraes-h3.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = /usr/share/emc/nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Uni-fraes-v3.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/cooltool/Uni-mill-cnc.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = /usr/share/emc/nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Task controller section -----------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions configs/dallur-thc/dallur-advanced.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RS274NGC_STARTUP_CODE = M52 P1
CYCLE_TIME = 0.200

# Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

# Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 1.2
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 2

# Increments for the JOG section
Expand Down
4 changes: 2 additions & 2 deletions configs/demo_mazak/demo_mazak.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ DISPLAY = axis
CYCLE_TIME = 0.100

# Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

# Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -52,7 +52,7 @@ PROGRAM_PREFIX = ../../nc_files/
PYVCP=panel.xml

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 1

EDITOR = gedit
Expand Down
4 changes: 2 additions & 2 deletions configs/demo_sim_cl/demo_sim_cl.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ DEBUG = 0
CYCLE_TIME = 0.200

# Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

# Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -45,7 +45,7 @@ MAX_FEED_OVERRIDE = 1.2
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 2

# Editor to be used with Axis
Expand Down
4 changes: 2 additions & 2 deletions configs/demo_step_cl/demo_step_cl.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ DEBUG = 0
CYCLE_TIME = 0.200

# Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

# Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -45,7 +45,7 @@ MAX_FEED_OVERRIDE = 1.2
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 2

# Task controller section -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion configs/etch-servo/etch.ini
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ MAX_FEED_OVERRIDE = 10
PROGRAM_PREFIX = ../../nc_files/

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# Editor to be used with Axis
Expand Down
2 changes: 1 addition & 1 deletion configs/gantry/gantry-hs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EDITOR = gedit
POSITION_OFFSET = RELATIVE
POSITION_FEEDBACK = ACTUAL
MAX_FEED_OVERRIDE = 1.2
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5
PROGRAM_PREFIX = /home/john/emc2/nc_files
INCREMENTS = .1in .05in .01in .005in .001in .0005in .0001in
Expand Down
2 changes: 1 addition & 1 deletion configs/gantry/gantry.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ EDITOR = gedit
POSITION_OFFSET = RELATIVE
POSITION_FEEDBACK = ACTUAL
MAX_FEED_OVERRIDE = 1.2
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5
PROGRAM_PREFIX = /home/john/emc2/nc_files
INCREMENTS = .1in .05in .01in .005in .001in .0005in .0001in
Expand Down
2 changes: 1 addition & 1 deletion configs/gladevcp/touchy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DISPLAY = touchy

PROGRAM_PREFIX = ../../nc_files/

INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5

# EMBED_TAB_NAME = Tools
Expand Down
2 changes: 1 addition & 1 deletion configs/halui_pyvcp/halui.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ MAX_SPINDLE_OVERRIDE = 1.2
# Prefix to be used
PROGRAM_PREFIX = ../../nc_files/
# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5
#uncomment the next line if you're using AXIS, and you want the vcp embedded
#PYVCP = vcp.xml
Expand Down
4 changes: 2 additions & 2 deletions configs/hexapod-sim/minitetra.ini
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ DEBUG = 0
CYCLE_TIME = 0.200

#- Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

#- Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = MACHINE
Expand All @@ -54,7 +54,7 @@ MAX_FEED_OVERRIDE = 2.0
PROGRAM_PREFIX = ../../nc_files/

#- Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 0.1

###############################################################################
Expand Down
4 changes: 2 additions & 2 deletions configs/hm2-servo/3x20-small.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ DISPLAY = axis
CYCLE_TIME = 0.0500

# Path to help file
HELP_FILE = tkemc.txt
HELP_FILE = tklinucnc.txt

# Initial display setting for position, RELATIVE or MACHINE
POSITION_OFFSET = RELATIVE
Expand All @@ -44,7 +44,7 @@ MAX_FEED_OVERRIDE = 1.5
PROGRAM_PREFIX = ../../nc_files/

# Introductory graphic
INTRO_GRAPHIC = emc2.gif
INTRO_GRAPHIC = linuxcnc.gif
INTRO_TIME = 5


Expand Down
Loading

0 comments on commit 51fc09f

Please sign in to comment.