All pastes #389353 Raw Edit

Someone

public text v1 · immutable
#389353 ·published 2007-03-10 18:13 UTC
rendered paste body
rayh@rayh-cyber1:~$ diff emc2/configs/sim emc2-head/configs/sim
diff emc2/configs/sim/axis.ini emc2-head/configs/sim/axis.ini
10c10
< VERSION =               $Revision: 1.22.2.4 $
---
> VERSION =               $Revision: 1.27 $
44c44
< PROGRAM_PREFIX = /home/rayh/emc2/nc_files
---
> PROGRAM_PREFIX = ../../ncfiles/
Only in emc2-head/configs/sim: check_constraints.hal
diff emc2/configs/sim/core_sim.hal emc2-head/configs/sim/core_sim.hal
7c7
< 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 m ax_joints=[TRAJ]AXES
Only in emc2-head/configs/sim: CVS
Only in emc2-head/configs/sim: .cvsignore
diff emc2/configs/sim/emc.nml emc2-head/configs/sim/emc.nml
15c15
< 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
diff emc2/configs/sim/keystick.ini emc2-head/configs/sim/keystick.ini
10c10
< VERSION =               $Revision: 1.6.2.3 $
---
> VERSION =               $Revision: 1.9 $
46c46
< PROGRAM_PREFIX = /home/rayh/emc2/nc_files
---
> PROGRAM_PREFIX = ../../ncfiles/
diff emc2/configs/sim/lathe.ini emc2-head/configs/sim/lathe.ini
10c10
< VERSION =               $Revision: 1.3.2.4 $
---
> VERSION =               $Revision: 1.7 $
46c46
< PROGRAM_PREFIX = /home/rayh/emc2/nc_files
---
> PROGRAM_PREFIX = ../../ncfiles/
diff emc2/configs/sim/mini.ini emc2-head/configs/sim/mini.ini
10c10
< VERSION =               $Revision: 1.6.2.3 $
---
> VERSION =               $Revision: 1.9 $
46c46
< PROGRAM_PREFIX = /home/rayh/emc2/nc_files
---
> PROGRAM_PREFIX = ../../ncfiles/
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 emc2/configs/sim/servo_sim.hal emc2-head/configs/sim/servo_sim.hal
7c7
< 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 m ax_joints=[TRAJ]AXES
diff emc2/configs/sim/servo_sim.ini emc2-head/configs/sim/servo_sim.ini
10c10
< VERSION =               $Revision: 1.8.2.3 $
---
> VERSION =               $Revision: 1.11 $
45c45
< PROGRAM_PREFIX = /home/rayh/emc2/nc_files
---
> PROGRAM_PREFIX = ../../ncfiles/
diff emc2/configs/sim/sim.tbl emc2-head/configs/sim/sim.tbl
2c2
< 1   1   0.5   .5   first   tool
---
> 1   1   0.5   1.0   first   tool
4c4
< 3   3   0.5   1.5
---
> 3   3   0.5   0.25
diff emc2/configs/sim/sim.tbl.bak emc2-head/configs/sim/sim.tbl.bak
2c2
< 1   1   0.5   1.5   first   tool
---
> 1   1   0.5   0.0   first   tool
4c4
< 3   3   0.5   1.5
---
> 3   3   0.5   0.25
diff emc2/configs/sim/simulated_home.hal emc2-head/configs/sim/simulated_home.ha l
13,15c13,15
< 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
diff emc2/configs/sim/sim.var emc2-head/configs/sim/sim.var
1,2d0
< 1000  1.000000
< 1001  2.000000
Only in emc2/configs/sim: sim.var~
diff emc2/configs/sim/sim.var.bak emc2-head/configs/sim/sim.var.bak
1,2d0
< 1000  1.000000
< 1001  2.000000
diff emc2/configs/sim/tkemc.ini emc2-head/configs/sim/tkemc.ini
10c10
< VERSION =               $Revision: 1.7.2.4 $
---
> VERSION =               $Revision: 1.11 $
52c52
< PROGRAM_PREFIX = /home/rayh/emc2/nc_files
---
> PROGRAM_PREFIX = ../../ncfiles/
diff emc2/configs/sim/tripod.ini emc2-head/configs/sim/tripod.ini
10c10
< VERSION =               $Revision: 1.4.2.5 $
---
> VERSION =               $Revision: 1.9 $
46c46
< PROGRAM_PREFIX = /home/rayh/emc2/nc_files
---
> PROGRAM_PREFIX = ../../ncfiles/
diff emc2/configs/sim/xemc.ini emc2-head/configs/sim/xemc.ini
10c10
< VERSION =               $Revision: 1.5.2.4 $
---
> VERSION =               $Revision: 1.9 $
46c46
< PROGRAM_PREFIX = /home/rayh/emc2/nc_files
---
> PROGRAM_PREFIX = ../../ncfiles/
rayh@rayh-cyber1:~$