rendered paste bodyrayh@rayh-cyber1:~$ diff -u emc2/configs/sim emc2-head/configs/sim
diff -u emc2/configs/sim/axis.ini emc2-head/configs/sim/axis.ini
--- emc2/configs/sim/axis.ini 2007-02-15 09:47:53.000000000 -0600
+++ emc2-head/configs/sim/axis.ini 2007-01-26 16:29:20.000000000 -0600
@@ -7,7 +7,7 @@
[EMC]
# Version of this INI file
-VERSION = $Revision: 1.22.2.4 $
+VERSION = $Revision: 1.27 $
# Name of machine, for use with display, etc.
MACHINE = EMC-HAL-SIM-AXIS
@@ -41,7 +41,7 @@
MAX_FEED_OVERRIDE = 1.2
MAX_SPINDLE_OVERRIDE = 1.0
# Prefix to be used
-PROGRAM_PREFIX = /home/rayh/emc2/nc_files
+PROGRAM_PREFIX = ../../ncfiles/
# Introductory graphic
INTRO_GRAPHIC = emc2.gif
Only in emc2-head/configs/sim: check_constraints.hal
diff -u emc2/configs/sim/core_sim.hal emc2-head/configs/sim/core_sim.hal
--- emc2/configs/sim/core_sim.hal 2007-01-28 17:03:38.000000000 -0600
+++ emc2-head/configs/sim/core_sim.hal 2007-03-10 11:42:35.000000000 -0600
@@ -4,7 +4,7 @@
# kinematics
loadrt trivkins
# motion controller, get name and thread periods from ini file
-loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD traj_period_nsec=[EMCMOT]TRAJ_PERIOD key=[EMCMOT]SHMEM_KEY
+loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD traj_period_nsec=[EMCMOT]TRAJ_PERIOD key=[EMCMOT]SHMEM_KEY max_joints=[TRAJ]AXES
# load 6 differentiators (for velocity and accel signals
loadrt ddt count=6
# load additional blocks
Only in emc2-head/configs/sim: CVS
Only in emc2-head/configs/sim: .cvsignore
diff -u emc2/configs/sim/emc.nml emc2-head/configs/sim/emc.nml
--- emc2/configs/sim/emc.nml 2007-01-28 13:52:19.000000000 -0600
+++ emc2-head/configs/sim/emc.nml 2007-03-10 11:42:34.000000000 -0600
@@ -12,7 +12,7 @@
# These are for the IO controller, EMCIO
B toolCmd SHMEM localhost 1024 0 0 4 16 1004 TCP=5005 xdr
-B toolSts SHMEM localhost 4096 0 0 5 16 1005 TCP=5005 xdr
+B toolSts SHMEM localhost 8192 0 0 5 16 1005 TCP=5005 xdr
# Processes
# Name Buffer Type Host Ops server? timeout master? cnum
diff -u emc2/configs/sim/keystick.ini emc2-head/configs/sim/keystick.ini
--- emc2/configs/sim/keystick.ini 2007-02-15 09:47:53.000000000 -0600
+++ emc2-head/configs/sim/keystick.ini 2007-01-26 16:29:20.000000000 -0600
@@ -7,7 +7,7 @@
[EMC]
# Version of this INI file
-VERSION = $Revision: 1.6.2.3 $
+VERSION = $Revision: 1.9 $
# Name of machine, for use with display, etc.
MACHINE = EMC-HAL-SIM-KEYSTICK
@@ -43,7 +43,7 @@
MAX_FEED_OVERRIDE = 1.2
# Prefix to be used
-PROGRAM_PREFIX = /home/rayh/emc2/nc_files
+PROGRAM_PREFIX = ../../ncfiles/
# No Introductory graphic, because we might be running a non-X setup
#INTRO_GRAPHIC = emc2.gif
diff -u emc2/configs/sim/lathe.ini emc2-head/configs/sim/lathe.ini
--- emc2/configs/sim/lathe.ini 2007-02-15 09:47:53.000000000 -0600
+++ emc2-head/configs/sim/lathe.ini 2007-01-26 16:29:20.000000000 -0600
@@ -7,7 +7,7 @@
[EMC]
# Version of this INI file
-VERSION = $Revision: 1.3.2.4 $
+VERSION = $Revision: 1.7 $
# Name of machine, for use with display, etc.
MACHINE = EMC-HAL-SIM-LATHE
@@ -43,7 +43,7 @@
MAX_FEED_OVERRIDE = 1.2
MAX_SPINDLE_OVERRIDE = 1.0
# Prefix to be used
-PROGRAM_PREFIX = /home/rayh/emc2/nc_files
+PROGRAM_PREFIX = ../../ncfiles/
# Introductory graphic
INTRO_GRAPHIC = emc2.gif
diff -u emc2/configs/sim/mini.ini emc2-head/configs/sim/mini.ini
--- emc2/configs/sim/mini.ini 2007-02-15 09:47:53.000000000 -0600
+++ emc2-head/configs/sim/mini.ini 2007-01-26 16:29:20.000000000 -0600
@@ -7,7 +7,7 @@
[EMC]
# Version of this INI file
-VERSION = $Revision: 1.6.2.3 $
+VERSION = $Revision: 1.9 $
# Name of machine, for use with display, etc.
MACHINE = EMC-HAL-SIM-MINI
@@ -43,7 +43,7 @@
MAX_FEED_OVERRIDE = 1.2
# Prefix to be used
-PROGRAM_PREFIX = /home/rayh/emc2/nc_files
+PROGRAM_PREFIX = ../../ncfiles/
# Introductory graphic
INTRO_GRAPHIC = emc2.gif
Only in emc2/configs/sim: mini_slowstep.ini
Only in emc2/configs/sim: mini_slowstep.ini~
Only in emc2-head/configs/sim: myconcavetest1.ngc
Only in emc2-head/configs/sim: pyvcp_demo.hal
Only in emc2-head/configs/sim: pyvcp_demo.xml
Only in emc2/configs/sim: .scope.cfg
diff -u emc2/configs/sim/servo_sim.hal emc2-head/configs/sim/servo_sim.hal
--- emc2/configs/sim/servo_sim.hal 2007-01-28 17:03:38.000000000 -0600
+++ emc2-head/configs/sim/servo_sim.hal 2007-03-07 07:12:18.000000000 -0600
@@ -4,7 +4,7 @@
# kinematics
loadrt trivkins
# motion controller, get name and thread periods from ini file
-loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD traj_period_nsec=[EMCMOT]TRAJ_PERIOD key=[EMCMOT]SHMEM_KEY
+loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD traj_period_nsec=[EMCMOT]TRAJ_PERIOD key=[EMCMOT]SHMEM_KEY max_joints=[TRAJ]AXES
# PID module, for three PID loops
loadrt pid num_chan=3
# 6 differentiators (for velocity and accel sigs),
diff -u emc2/configs/sim/servo_sim.ini emc2-head/configs/sim/servo_sim.ini
--- emc2/configs/sim/servo_sim.ini 2007-02-15 09:47:53.000000000 -0600
+++ emc2-head/configs/sim/servo_sim.ini 2007-01-26 12:02:52.000000000 -0600
@@ -7,7 +7,7 @@
[EMC]
# Version of this INI file
-VERSION = $Revision: 1.8.2.3 $
+VERSION = $Revision: 1.11 $
# Name of machine, for use with display, etc.
MACHINE = EMC-HAL-SERVO-SIM
@@ -42,7 +42,7 @@
MAX_FEED_OVERRIDE = 1.2
# Prefix to be used
-PROGRAM_PREFIX = /home/rayh/emc2/nc_files
+PROGRAM_PREFIX = ../../ncfiles/
# Introductory graphic
INTRO_GRAPHIC = emc2.gif
diff -u emc2/configs/sim/sim.tbl emc2-head/configs/sim/sim.tbl
--- emc2/configs/sim/sim.tbl 2007-03-10 12:11:14.000000000 -0600
+++ emc2-head/configs/sim/sim.tbl 2007-02-23 19:32:16.000000000 -0600
@@ -1,7 +1,7 @@
POC FMS LEN DIAM COMMENT
-1 1 0.5 .5 first tool
+1 1 0.5 1.0 first tool
2 2 0.7 0.125
-3 3 0.5 1.5
+3 3 0.5 0.25
4 4 0.7 1.0
32 32 0.5 0.0 last tool
diff -u emc2/configs/sim/sim.tbl.bak emc2-head/configs/sim/sim.tbl.bak
--- emc2/configs/sim/sim.tbl.bak 2007-03-10 12:09:19.000000000 -0600
+++ emc2-head/configs/sim/sim.tbl.bak 2007-02-23 19:30:43.000000000 -0600
@@ -1,7 +1,7 @@
POC FMS LEN DIAM COMMENT
-1 1 0.5 1.5 first tool
+1 1 0.5 0.0 first tool
2 2 0.7 0.125
-3 3 0.5 1.5
+3 3 0.5 0.25
4 4 0.7 1.0
32 32 0.5 0.0 last tool
diff -u emc2/configs/sim/simulated_home.hal emc2-head/configs/sim/simulated_home.hal
--- emc2/configs/sim/simulated_home.hal 2007-01-28 13:52:19.000000000 -0600
+++ emc2-head/configs/sim/simulated_home.hal 2007-01-08 09:57:10.000000000 -0600
@@ -10,9 +10,9 @@
linksp Xpos comp.0.in1
linksp Ypos comp.1.in1
linksp Zpos comp.2.in1
-setp comp.0.hyst .01
-setp comp.1.hyst .01
-setp comp.2.hyst .01
+setp comp.0.hyst .02
+setp comp.1.hyst .02
+setp comp.2.hyst .02
newsig Xhomesw bit
newsig Yhomesw bit
diff -u emc2/configs/sim/sim.var emc2-head/configs/sim/sim.var
--- emc2/configs/sim/sim.var 2007-03-10 12:11:56.000000000 -0600
+++ emc2-head/configs/sim/sim.var 2007-03-10 12:05:34.000000000 -0600
@@ -1,5 +1,3 @@
-1000 1.000000
-1001 2.000000
5161 0.000000
5162 0.000000
5163 0.000000
Only in emc2/configs/sim: sim.var~
diff -u emc2/configs/sim/sim.var.bak emc2-head/configs/sim/sim.var.bak
--- emc2/configs/sim/sim.var.bak 2007-03-10 12:11:14.000000000 -0600
+++ emc2-head/configs/sim/sim.var.bak 2007-03-10 12:05:28.000000000 -0600
@@ -1,5 +1,3 @@
-1000 1.000000
-1001 2.000000
5161 0.000000
5162 0.000000
5163 0.000000
diff -u emc2/configs/sim/tkemc.ini emc2-head/configs/sim/tkemc.ini
--- emc2/configs/sim/tkemc.ini 2007-02-15 09:47:53.000000000 -0600
+++ emc2-head/configs/sim/tkemc.ini 2007-01-26 16:29:20.000000000 -0600
@@ -7,7 +7,7 @@
[EMC]
# Version of this INI file
-VERSION = $Revision: 1.7.2.4 $
+VERSION = $Revision: 1.11 $
# Name of machine, for use with display, etc.
MACHINE = EMC-HAL-SIM-TKEMC
@@ -49,7 +49,7 @@
MAX_SPINDLE_OVERRIDE = 1.5
# Prefix to be used
-PROGRAM_PREFIX = /home/rayh/emc2/nc_files
+PROGRAM_PREFIX = ../../ncfiles/
# Introductory graphic
INTRO_GRAPHIC = emc2.gif
diff -u emc2/configs/sim/tripod.ini emc2-head/configs/sim/tripod.ini
--- emc2/configs/sim/tripod.ini 2007-02-15 09:47:53.000000000 -0600
+++ emc2-head/configs/sim/tripod.ini 2007-01-26 16:29:20.000000000 -0600
@@ -7,7 +7,7 @@
[EMC]
# Version of this INI file
-VERSION = $Revision: 1.4.2.5 $
+VERSION = $Revision: 1.9 $
# Name of machine, for use with display, etc.
MACHINE = EMC-TRIPOD-SIM-TKEMC
@@ -43,7 +43,7 @@
MAX_FEED_OVERRIDE = 1.2
# Prefix to be used
-PROGRAM_PREFIX = /home/rayh/emc2/nc_files
+PROGRAM_PREFIX = ../../ncfiles/
# Introductory graphic
INTRO_GRAPHIC = emc2.gif
diff -u emc2/configs/sim/xemc.ini emc2-head/configs/sim/xemc.ini
--- emc2/configs/sim/xemc.ini 2007-02-15 09:47:53.000000000 -0600
+++ emc2-head/configs/sim/xemc.ini 2007-01-26 16:29:20.000000000 -0600
@@ -7,7 +7,7 @@
[EMC]
# Version of this INI file
-VERSION = $Revision: 1.5.2.4 $
+VERSION = $Revision: 1.9 $
# Name of machine, for use with display, etc.
MACHINE = EMC-HAL-SIM-XEMC
@@ -43,7 +43,7 @@
MAX_FEED_OVERRIDE = 1.2
# Prefix to be used
-PROGRAM_PREFIX = /home/rayh/emc2/nc_files
+PROGRAM_PREFIX = ../../ncfiles/
# Introductory graphic
INTRO_GRAPHIC = emc2.gif
rayh@rayh-cyber1:~$