configs/sim/python_demo: move configs to

more appropriate directories: configs/sim/axis/iocontrolv2 configs/sim/axis/spindle_orient configs/sim/axis/orphans There may still be problems with some files in the reorganized configs/sim tree, but comparing to a commit that predates the rearrangement the problems may have pre-existed. configs/sim/axis/iocontrolv2 -----------------|------------------------------|------------------------------| ini_file |master_with_this_patch |commit_before_configs_reorg | | |(1c688d on 4dec2013) | -----------------|------------------------------|------------------------------| m66track.ini |runs both (shortened) |fails after first loop in | |loops in t3.ngc |t3.ngc too few tools for loop | |using [EMCIO]EMCIO = iov2 | | -----------------|------------------------------|------------------------------| g8812.ini |toolchange without |toolchange needs intervention | |intervention for | | |iocontrol.0.start-change-ack | | |using [EMCIO]EMCIO = iov2 | | -----------------|------------------------------|------------------------------| axis-iocontrolv2 |runs as before |main running demo | -demo.ini | | | -----------------|------------------------------|------------------------------| owordm6-ui.ini |runs but may be damaged |fails to run: missing pin: | |since removed postgui_halfile | gladevcp.fail-next-op | |using [EMCIO]EMCIO = iov2 | | -----------------|------------------------------|------------------------------| owordm6-ui-ns.ini|runs |runs, intervention needed | |using [EMCIO]EMCIO = iov2 | | -----------------|------------------------------|------------------------------| Notes: 1) using: [EMCIO]EMCIO = iov2 lets ini work from pickconfig without user intervention for the pin iocontrol.0.start-change-ack added a note in README so user can learn how to modify configs/sim/axis/spindle_orient -----------------|------------------------------|------------------------------| ini_file |master_with_this_patch |commit_before_configs_reorg | | |(1c688d on 4dec2013) | -----------------|------------------------------|------------------------------| orient.ini |seems to work |seems to work | -----------------|------------------------------|------------------------------| These are problematic -- they havent worked for a long time: configs/sim/axis/orphans -----------------|------------------------------|------------------------------| ini_file |master_with_this_patch |commit_before_configs_reorg | | |(1c688d on 4dec2013) | -----------------|------------------------------|------------------------------| py.ini | not working (did it ever?) |fails: core_sim_test.hal:46: | renamed: | | 'iocontrol.0.user-enable-out'| py.ini.notworking| | does not exist | -----------------|------------------------------|------------------------------| pyiocontrol.ini | not working (did it ever?) |fails: core_sim_test.hal:46: | renamed: | | 'iocontrol.0.user-enable-out'| pyiocontrol.ini. | | does not exist | notworking | | | -----------------|------------------------------|------------------------------| axis_noio.ini | same behavior | runs after delay, in estop | -----------------|------------------------------|------------------------------| The subdir: configs/sim/axis/orphans/pysubs/ probably duplicates files in other places and could be removed. Possible duplicates (or redundancies): configs/sim/axis/orphans/pysubs/customtask.py configs/sim/axis/remap/iocontrol-removed/python/customtask.py configs/sim/axis/orphans/pysubs/nulluserfuncs.py configs/sim/axis/remap/iocontrol-removed/python/nulluserfuncs.py configs/sim/axis/orphans/pysubs/oword.py configs/sim/axis/remap/getting-started/python/oword.py configs/sim/axis/remap/iocontrol-removed/python/oword.py configs/sim/axis/orphans/pysubs/plugins.py configs/sim/axis/orphans/pysubs/sqltoolaccess.py configs/sim/axis/remap/iocontrol-removed/python/sqltoolaccess.py configs/sim/axis/orphans/pysubs/task.py configs/sim/axis/remap/iocontrol-removed/python/task.py configs/sim/axis/orphans/pysubs/tooltable.py configs/sim/axis/remap/iocontrol-removed/python/tooltable.py configs/sim/axis/orphans/pysubs/userfuncs.py configs/sim/axis/remap/iocontrol-removed/python/userfuncs.py configs/sim/axis/orphans/pysubs/remap.py many
author: Dewey Garrett <dgarrett@panix.com> 2014-04-01 19:37:38 -0700
committer: Dewey Garrett <dgarrett@panix.com> 2014-04-03 08:40:10 -0700
commit: 44f6bd51cce4afa42b31f42cdca2fb990a17f43f (patch)
tree: 1021bc520de9ae83e71aa592d83343a967d5a2c6
parent: 038de8d85401dd6a1a6a79817722e06eda258a31 (diff)
download: linuxcnc-44f6bd51cce4afa42b31f42cdca2fb990a17f43f.tar.gz
linuxcnc-44f6bd51cce4afa42b31f42cdca2fb990a17f43f.zip
53 files changed, 123 insertions, 21 deletions
diff --git a/configs/sim/axis/iocontrolv2/README b/configs/sim/axis/iocontrolv2/README
new file mode 100644
index 000000000..94437f043
--- /dev/null
+++ b/configs/sim/axis/iocontrolv2/README
@@ -0,0 +1,20 @@
+Configs to demonstrate iocontrolv2
+
+Main demo:
+axis-iocontrolv2-demo.ini
+
+
+Other demos:
+g8812.ini
+m66track.ini -- M6 and M61 loops
+owordm6-ui.ini
+owordm6-ui-ns.ini
+
+
+Notes:
+  Some ini files use:
+     EMCIO = iov2
+  See ini file for starting with -support-start-change
+
+  There may be abort messages on startup when reading the OPEN_FILE, clear in the axis gui with Ctrl-space
+
diff --git a/configs/sim/axis/python_demo/axis-iocontrolv2-demo.ini b/configs/sim/axis/iocontrolv2/axis-iocontrolv2-demo.ini
index f98c6ba92..f98c6ba92 100644
--- a/configs/sim/axis/python_demo/axis-iocontrolv2-demo.ini
+++ b/configs/sim/axis/iocontrolv2/axis-iocontrolv2-demo.ini
diff --git a/configs/sim/axis/python_demo/axis_owordsub_manualtoolchange.hal b/configs/sim/axis/iocontrolv2/axis_owordsub_manualtoolchange.hal
index 8413d9f16..8413d9f16 100644
--- a/configs/sim/axis/python_demo/axis_owordsub_manualtoolchange.hal
+++ b/configs/sim/axis/iocontrolv2/axis_owordsub_manualtoolchange.hal
diff --git a/configs/sim/axis/python_demo/core_sim.hal b/configs/sim/axis/iocontrolv2/core_sim.hal
index b79df2d33..b79df2d33 120000
--- a/configs/sim/axis/python_demo/core_sim.hal
+++ b/configs/sim/axis/iocontrolv2/core_sim.hal
diff --git a/configs/sim/axis/python_demo/g8812.ini b/configs/sim/axis/iocontrolv2/g8812.ini
index a6007134b..14215b02a 100644
--- a/configs/sim/axis/python_demo/g8812.ini
+++ b/configs/sim/axis/iocontrolv2/g8812.ini
@@ -299,12 +299,12 @@ HOME_IS_SHARED = 1
 #  NB: if the start-change pin isnt used it needs to be looped like below to
 #  start-change-ack or an M6 will hang waiting for start-change-ack:
 #  net start-change iocontrol.0.start-change  iocontrol.0.start-change-ack
-EMCIO = 		iov2 -support-start-change
+#EMCIO = 		iov2 -support-start-change
 
 # starting iov2 like so will create the start-change and start-change-ack pins
 # but the start-change protocol remains disabled - start-change remains low and
 # start-change-ack is ignored:
-#EMCIO = 		iov2
+EMCIO = 		iov2
 
 # cycle time, in seconds
 CYCLE_TIME =    0.100
diff --git a/configs/sim/axis/python_demo/m66track.ini b/configs/sim/axis/iocontrolv2/m66track.ini
index 573d17e8d..bfcbac417 100644
--- a/configs/sim/axis/python_demo/m66track.ini
+++ b/configs/sim/axis/iocontrolv2/m66track.ini
@@ -258,12 +258,12 @@ HOME_IS_SHARED = 1
 #  NB: if the start-change pin isnt used it needs to be looped like below to
 #  start-change-ack or an M6 will hang waiting for start-change-ack:
 #  net start-change iocontrol.0.start-change  iocontrol.0.start-change-ack
-EMCIO = 		iov2 -support-start-change
+#EMCIO = 		iov2 -support-start-change
 
 # starting iov2 like so will create the start-change and start-change-ack pins
 # but the start-change protocol remains disabled - start-change remains low and
 # start-change-ack is ignored:
-#EMCIO = 		iov2
+EMCIO = 		iov2
 
 # cycle time, in seconds
 CYCLE_TIME =    0.100
diff --git a/configs/sim/axis/python_demo/nstools.tbl b/configs/sim/axis/iocontrolv2/nstools.tbl
index a8c9c07b6..a8c9c07b6 120000
--- a/configs/sim/axis/python_demo/nstools.tbl
+++ b/configs/sim/axis/iocontrolv2/nstools.tbl
diff --git a/nc_files/orphans/on_abort.ngc b/configs/sim/axis/iocontrolv2/on_abort.ngc
index 8f1c004ea..6349a865a 100644
--- a/nc_files/orphans/on_abort.ngc
+++ b/configs/sim/axis/iocontrolv2/on_abort.ngc
@@ -29,6 +29,30 @@
 ;
 O<on_abort> sub
  (DEBUG, on_abort called, reason = [#1])
+o<if1> if [#1 EQ 1] 
+          (DEBUG, on_abort called: EMC_ABORT_TASK_EXEC_ERROR)
+o<if1> endif
+o<if2> if [#1 EQ 2] 
+          (DEBUG, on_abort called: EMC_ABORT_AUX_ESTOP)
+o<if2> endif
+o<if3> if [#1 EQ 3] 
+          (DEBUG, on_abort called: EMC_ABORT_MOTION_OR_IO_RCS_ERROR)
+o<if3> endif
+o<if4> if [#1 EQ 4] 
+          (DEBUG, on_abort called: EMC_ABORT_TASK_STATE_OFF)
+o<if4> endif
+o<if5> if [#1 EQ 5] 
+          (DEBUG, on_abort called: EMC_ABORT_TASK_STATE_ESTOP_RESET)
+o<if5> endif
+o<if6> if [#1 EQ 6] 
+          (DEBUG, on_abort called: EMC_ABORT_TASK_STATE_ESTOP)
+o<if6> endif
+o<if7> if [#1 EQ 7] 
+          (DEBUG, on_abort called: EMC_ABORT_TASK_STATE_NOT_ON)
+o<if7> endif
+o<if8> if [#1 EQ 8] 
+          (DEBUG, on_abort called: EMC_ABORT_TASK_ABORT)
+o<if8> endif
 ; (DEBUG, deasserting motion.digital-out-00 as iocontrol.tool-prepare)
 ;
 M65 P0
diff --git a/configs/sim/axis/python_demo/osubdemo-ns.ui b/configs/sim/axis/iocontrolv2/osubdemo-ns.ui
index d02c3a3a3..d02c3a3a3 100644
--- a/configs/sim/axis/python_demo/osubdemo-ns.ui
+++ b/configs/sim/axis/iocontrolv2/osubdemo-ns.ui
diff --git a/configs/sim/axis/python_demo/osubdemo.ui b/configs/sim/axis/iocontrolv2/osubdemo.ui
index c18061aeb..c18061aeb 100644
--- a/configs/sim/axis/python_demo/osubdemo.ui
+++ b/configs/sim/axis/iocontrolv2/osubdemo.ui
diff --git a/configs/sim/axis/python_demo/owordm6-ui-ns.ini b/configs/sim/axis/iocontrolv2/owordm6-ui-ns.ini
index f326ad5b4..8caf5c9f5 100644
--- a/configs/sim/axis/python_demo/owordm6-ui-ns.ini
+++ b/configs/sim/axis/iocontrolv2/owordm6-ui-ns.ini
@@ -257,12 +257,12 @@ HOME_IS_SHARED = 1
 #  NB: if the start-change pin isnt used it needs to be looped like below to
 #  start-change-ack or an M6 will hang waiting for start-change-ack:
 #  net start-change iocontrol.0.start-change  iocontrol.0.start-change-ack
-EMCIO = 		iov2 -support-start-change
+#EMCIO = 		iov2 -support-start-change
 
 # starting iov2 like so will create the start-change and start-change-ack pins
 # but the start-change protocol remains disabled - start-change remains low and
 # start-change-ack is ignored:
-#EMCIO = 		iov2
+EMCIO = 		iov2
 
 # cycle time, in seconds
 CYCLE_TIME =    0.100
diff --git a/configs/sim/axis/python_demo/owordm6-ui.ini b/configs/sim/axis/iocontrolv2/owordm6-ui.ini
index 09db7f4b4..c60435b1d 100644
--- a/configs/sim/axis/python_demo/owordm6-ui.ini
+++ b/configs/sim/axis/iocontrolv2/owordm6-ui.ini
@@ -141,7 +141,9 @@ HALFILE = simulated_home.hal
 # Single file that is executed after the GUI has started.  Only supported by
 # AXIS at this time (only AXIS creates a HAL component of its own)
 #POSTGUI_HALFILE = test_postgui.hal
-POSTGUI_HALFILE = v2_oword_gladevcp_postgui.hal
+
+# commented next line because of missing pin: gladecp.fail-next-op 
+# POSTGUI_HALFILE = v2_oword_gladevcp_postgui.hal
 
 HALUI = halui
 
@@ -237,12 +239,12 @@ HOME_IS_SHARED = 1
 #  NB: if the start-change pin isnt used it needs to be looped like below to
 #  start-change-ack or an M6 will hang waiting for start-change-ack:
 #  net start-change iocontrol.0.start-change  iocontrol.0.start-change-ack
-EMCIO = 		iov2 -support-start-change
+#EMCIO = 		iov2 -support-start-change
 
 # starting iov2 like so will create the start-change and start-change-ack pins
 # but the start-change protocol remains disabled - start-change remains low and
 # start-change-ack is ignored:
-#EMCIO = 		iov2 
+EMCIO = 		iov2 
 
 # cycle time, in seconds
 CYCLE_TIME =    0.100
diff --git a/configs/sim/axis/python_demo/sim_mm.tbl b/configs/sim/axis/iocontrolv2/sim_mm.tbl
index fc1bee07e..fc1bee07e 120000
--- a/configs/sim/axis/python_demo/sim_mm.tbl
+++ b/configs/sim/axis/iocontrolv2/sim_mm.tbl
diff --git a/configs/sim/axis/python_demo/sim_mm_test.tbl b/configs/sim/axis/iocontrolv2/sim_mm_test.tbl
index 69d8e3fac..69d8e3fac 120000
--- a/configs/sim/axis/python_demo/sim_mm_test.tbl
+++ b/configs/sim/axis/iocontrolv2/sim_mm_test.tbl
diff --git a/configs/sim/axis/python_demo/simulated_home.hal b/configs/sim/axis/iocontrolv2/simulated_home.hal
index a0e8e5601..a0e8e5601 120000
--- a/configs/sim/axis/python_demo/simulated_home.hal
+++ b/configs/sim/axis/iocontrolv2/simulated_home.hal
diff --git a/configs/sim/axis/python_demo/t3.ngc b/configs/sim/axis/iocontrolv2/t3.ngc
index 878bfed6f..47356c9f7 100644
--- a/configs/sim/axis/python_demo/t3.ngc
+++ b/configs/sim/axis/iocontrolv2/t3.ngc
@@ -3,22 +3,22 @@
 
 #<n> = 1
 o10 do
-(debug,n=#<n>)
+(debug,t3.ngc: Using M61 n=#<n>)
 M61Q#<n>G43
 g4p1
 G49
 #<n> = [[#<n>] + 1]
-o10 while [[#<n>] LT 24]
+o10 while [[#<n>] LT 4] ;was LT 24
 
 #<n> = 1
 o100 do
-(debug,n=#<n>)
+(debug,t3.ngc: Using M6 n=#<n>)
 t#<n>m6G43
 g4p2
 G49
 #<n> = [[#<n>] + 1]
 
-o100 while [[#<n>] LT 24]
+o100 while [[#<n>] LT 4] ; was LT 24
 ;f123s350m6m4m8m49g18g21g94t1
 ;m75p2q47
 ;g88.1X1Y2Z3f200
diff --git a/nc_files/tdemo.ngc b/configs/sim/axis/iocontrolv2/tdemo.ngc
index ee17a4c20..ee17a4c20 100644
--- a/nc_files/tdemo.ngc
+++ b/configs/sim/axis/iocontrolv2/tdemo.ngc
diff --git a/configs/sim/axis/python_demo/toolchange-demo.ngc b/configs/sim/axis/iocontrolv2/toolchange-demo.ngc
index 336584a97..336584a97 100644
--- a/configs/sim/axis/python_demo/toolchange-demo.ngc
+++ b/configs/sim/axis/iocontrolv2/toolchange-demo.ngc
diff --git a/configs/sim/axis/python_demo/v2-tc.ui b/configs/sim/axis/iocontrolv2/v2-tc.ui
index 8f4d4f155..8f4d4f155 100644
--- a/configs/sim/axis/python_demo/v2-tc.ui
+++ b/configs/sim/axis/iocontrolv2/v2-tc.ui
diff --git a/configs/sim/axis/python_demo/v2_gladevcp_postgui.hal b/configs/sim/axis/iocontrolv2/v2_gladevcp_postgui.hal
index ddbbbcb55..ddbbbcb55 100644
--- a/configs/sim/axis/python_demo/v2_gladevcp_postgui.hal
+++ b/configs/sim/axis/iocontrolv2/v2_gladevcp_postgui.hal
diff --git a/configs/sim/axis/python_demo/v2_oword_gladevcp_postgui.hal b/configs/sim/axis/iocontrolv2/v2_oword_gladevcp_postgui.hal
index 34bd77d37..d3576a346 100644
--- a/configs/sim/axis/python_demo/v2_oword_gladevcp_postgui.hal
+++ b/configs/sim/axis/iocontrolv2/v2_oword_gladevcp_postgui.hal
@@ -29,6 +29,8 @@ net halui-abort gladevcp.halui-abort halui.abort
 
 # fail change
 
-net fail-change gladevcp.fail-next-op gladevcp.fail-change-led motion.digital-in-02
+# ???  no pin named gladevcp.fail-change-led
+# net fail-change gladevcp.fail-next-op gladevcp.fail-change-led motion.digital-in-02
+net fail-change gladevcp.fail-next-op motion.digital-in-02
 
 net fvalue gladevcp.spinbutton-f motion.analog-in-00
diff --git a/configs/sim/axis/orphans/README b/configs/sim/axis/orphans/README
new file mode 100644
index 000000000..3db068cb1
--- /dev/null
+++ b/configs/sim/axis/orphans/README
@@ -0,0 +1,49 @@
+orphans
+
+Obsolete or broken configs
+
+
+axis_noio.ini no io specified:
+  [EMCIO]EMCIO =
+
+py.ini.notworking  -- needs work
+pyiocontrol.ini.notworking  -- needs work
+
+
+
+directory: configs/sim/axis/orphans/pysubs
+
+originally was: configs/sim/axis/pysubs
+
+The examples here seem to similar to or redundant to
+files in configs/sim/axis/remap/
+
+-------------------------------------------------------
+
+configs/sim/axis/orphans/pysubs/customtask.py
+configs/sim/axis/remap/iocontrol-removed/python/customtask.py
+
+configs/sim/axis/orphans/pysubs/nulluserfuncs.py
+configs/sim/axis/remap/iocontrol-removed/python/nulluserfuncs.py
+
+configs/sim/axis/orphans/pysubs/oword.py
+configs/sim/axis/remap/getting-started/python/oword.py
+configs/sim/axis/remap/iocontrol-removed/python/oword.py
+
+configs/sim/axis/orphans/pysubs/plugins.py
+
+
+configs/sim/axis/orphans/pysubs/sqltoolaccess.py
+configs/sim/axis/remap/iocontrol-removed/python/sqltoolaccess.py
+
+configs/sim/axis/orphans/pysubs/task.py
+configs/sim/axis/remap/iocontrol-removed/python/task.py
+
+configs/sim/axis/orphans/pysubs/tooltable.py
+configs/sim/axis/remap/iocontrol-removed/python/tooltable.py
+
+configs/sim/axis/orphans/pysubs/userfuncs.py
+configs/sim/axis/remap/iocontrol-removed/python/userfuncs.py
+
+configs/sim/axis/orphans/pysubs/remap.py
+many
diff --git a/configs/sim/axis/python_demo/axis_manualtoolchange.hal b/configs/sim/axis/orphans/axis_manualtoolchange.hal
index 397c8934a..397c8934a 120000
--- a/configs/sim/axis/python_demo/axis_manualtoolchange.hal
+++ b/configs/sim/axis/orphans/axis_manualtoolchange.hal
diff --git a/configs/sim/axis/python_demo/axis_noio.ini b/configs/sim/axis/orphans/axis_noio.ini
index 25082ad3d..25082ad3d 100644
--- a/configs/sim/axis/python_demo/axis_noio.ini
+++ b/configs/sim/axis/orphans/axis_noio.ini
diff --git a/configs/sim/axis/python_demo/core_sim_noio.hal b/configs/sim/axis/orphans/core_sim_noio.hal
index be0e9b576..be0e9b576 100644
--- a/configs/sim/axis/python_demo/core_sim_noio.hal
+++ b/configs/sim/axis/orphans/core_sim_noio.hal
diff --git a/configs/sim/axis/python_demo/core_sim_noiocontrol.hal b/configs/sim/axis/orphans/core_sim_noiocontrol.hal
index 64e673d00..64e673d00 100644
--- a/configs/sim/axis/python_demo/core_sim_noiocontrol.hal
+++ b/configs/sim/axis/orphans/core_sim_noiocontrol.hal
diff --git a/configs/sim/axis/python_demo/core_sim_test.hal b/configs/sim/axis/orphans/core_sim_test.hal
index 7b263ddb3..7b263ddb3 100644
--- a/configs/sim/axis/python_demo/core_sim_test.hal
+++ b/configs/sim/axis/orphans/core_sim_test.hal
diff --git a/configs/sim/axis/python_demo/gladevcp_postgui.hal b/configs/sim/axis/orphans/gladevcp_postgui.hal
index ef154f0f6..ef154f0f6 100644
--- a/configs/sim/axis/python_demo/gladevcp_postgui.hal
+++ b/configs/sim/axis/orphans/gladevcp_postgui.hal
diff --git a/configs/sim/axis/python_demo/iov2.hal b/configs/sim/axis/orphans/iov2.hal
index bbc69051d..bbc69051d 100644
--- a/configs/sim/axis/python_demo/iov2.hal
+++ b/configs/sim/axis/orphans/iov2.hal
diff --git a/configs/sim/axis/python_demo/no-iotask.nml b/configs/sim/axis/orphans/no-iotask.nml
index bd76900ac..bd76900ac 100644
--- a/configs/sim/axis/python_demo/no-iotask.nml
+++ b/configs/sim/axis/orphans/no-iotask.nml
diff --git a/configs/sim/axis/python_demo/py.ini.notworking b/configs/sim/axis/orphans/py.ini.notworking
index 4dd1d7365..79ce3d8e2 100644
--- a/configs/sim/axis/python_demo/py.ini.notworking
+++ b/configs/sim/axis/orphans/py.ini.notworking
@@ -63,7 +63,7 @@ DISPLAY =             axis
 #OPEN_FILE=../../nc_files/m66test.ngc
 #OPEN_FILE=/home/mah/emc2-tc/nc_files/arcspiral.ngc
 #OPEN_FILE=/home/mah/emc2-tc/nc_files/taskcall.ngc
-OPEN_FILE=./nc_files/taskcall.ngc
+OPEN_FILE=./taskcall.ngc
 
 # Cycle time, in seconds, that display will sleep between polls
 CYCLE_TIME =            0.100
@@ -114,7 +114,8 @@ CYCLE_TIME =            0.001
 
 [PYTHON]
 
-PLUGIN_DIR=/home/mah/emc2-tc/configs/sim/pysubs
+#PLUGIN_DIR=/home/mah/emc2-tc/configs/sim/pysubs
+PLUGIN_DIR=./pysubs
 
 # import the following Python modules
 MODULE_BASENAME=plugins
diff --git a/configs/sim/axis/python_demo/pyiocontrol.ini.notworking b/configs/sim/axis/orphans/pyiocontrol.ini.notworking
index cd91161a8..ffeb51738 100644
--- a/configs/sim/axis/python_demo/pyiocontrol.ini.notworking
+++ b/configs/sim/axis/orphans/pyiocontrol.ini.notworking
@@ -82,7 +82,7 @@ DISPLAY =             axis
 #OPEN_FILE=../../nc_files/m66test.ngc
 #OPEN_FILE=/home/mah/emc2-tc/nc_files/arcspiral.ngc
 #OPEN_FILE=/home/mah/emc2-tc/nc_files/taskcall.ngc
-OPEN_FILE=./nc_files/taskcall.ngc
+OPEN_FILE=./taskcall.ngc
 
 # Cycle time, in seconds, that display will sleep between polls
 CYCLE_TIME =            0.100
@@ -133,7 +133,8 @@ CYCLE_TIME =            0.001
 
 [PYTHON]
 
-PLUGIN_DIR=/home/mah/emc2-tc/configs/sim/pysubs
+#PLUGIN_DIR=/home/mah/emc2-tc/configs/sim/pysubs
+PLUGIN_DIR=./pysubs
 
 # import the following Python modules
 MODULE_BASENAME=plugins
diff --git a/configs/sim/axis/python_demo/pysubs/customtask.py b/configs/sim/axis/orphans/pysubs/customtask.py
index 4b37e5d23..4b37e5d23 100644
--- a/configs/sim/axis/python_demo/pysubs/customtask.py
+++ b/configs/sim/axis/orphans/pysubs/customtask.py
diff --git a/configs/sim/axis/python_demo/pysubs/nulluserfuncs.py b/configs/sim/axis/orphans/pysubs/nulluserfuncs.py
index 033786e54..033786e54 100644
--- a/configs/sim/axis/python_demo/pysubs/nulluserfuncs.py
+++ b/configs/sim/axis/orphans/pysubs/nulluserfuncs.py
diff --git a/configs/sim/axis/python_demo/pysubs/oword.py b/configs/sim/axis/orphans/pysubs/oword.py
index 87a61eb0e..87a61eb0e 100644
--- a/configs/sim/axis/python_demo/pysubs/oword.py
+++ b/configs/sim/axis/orphans/pysubs/oword.py
diff --git a/configs/sim/axis/python_demo/pysubs/plugins.py b/configs/sim/axis/orphans/pysubs/plugins.py
index 2ee9a2085..2ee9a2085 100644
--- a/configs/sim/axis/python_demo/pysubs/plugins.py
+++ b/configs/sim/axis/orphans/pysubs/plugins.py
diff --git a/configs/sim/axis/python_demo/pysubs/remap.py b/configs/sim/axis/orphans/pysubs/remap.py
index 07c4fbb2f..07c4fbb2f 100644
--- a/configs/sim/axis/python_demo/pysubs/remap.py
+++ b/configs/sim/axis/orphans/pysubs/remap.py
diff --git a/configs/sim/axis/python_demo/pysubs/sqltoolaccess.py b/configs/sim/axis/orphans/pysubs/sqltoolaccess.py
index b2ebe7510..b2ebe7510 100644
--- a/configs/sim/axis/python_demo/pysubs/sqltoolaccess.py
+++ b/configs/sim/axis/orphans/pysubs/sqltoolaccess.py
diff --git a/configs/sim/axis/python_demo/pysubs/task.py b/configs/sim/axis/orphans/pysubs/task.py
index ad870462c..ad870462c 100644
--- a/configs/sim/axis/python_demo/pysubs/task.py
+++ b/configs/sim/axis/orphans/pysubs/task.py
diff --git a/configs/sim/axis/python_demo/pysubs/tooltable.py b/configs/sim/axis/orphans/pysubs/tooltable.py
index 0d57614e7..0d57614e7 100644
--- a/configs/sim/axis/python_demo/pysubs/tooltable.py
+++ b/configs/sim/axis/orphans/pysubs/tooltable.py
diff --git a/configs/sim/axis/python_demo/pysubs/userfuncs.py b/configs/sim/axis/orphans/pysubs/userfuncs.py
index 46ea9ae8d..46ea9ae8d 100644
--- a/configs/sim/axis/python_demo/pysubs/userfuncs.py
+++ b/configs/sim/axis/orphans/pysubs/userfuncs.py
diff --git a/configs/sim/axis/orphans/sim_mm.tbl b/configs/sim/axis/orphans/sim_mm.tbl
new file mode 120000
index 000000000..fc1bee07e
--- /dev/null
+++ b/configs/sim/axis/orphans/sim_mm.tbl
@@ -0,0 +1 @@
+../../sim_mm.tbl
+\ No newline at end of file
diff --git a/configs/sim/axis/orphans/simulated_home.hal b/configs/sim/axis/orphans/simulated_home.hal
new file mode 120000
index 000000000..a0e8e5601
--- /dev/null
+++ b/configs/sim/axis/orphans/simulated_home.hal
@@ -0,0 +1 @@
+../../simulated_home.hal
+\ No newline at end of file
diff --git a/configs/sim/axis/python_demo/taskcall.ngc b/configs/sim/axis/orphans/taskcall.ngc
index 44afa70a8..44afa70a8 100644
--- a/configs/sim/axis/python_demo/taskcall.ngc
+++ b/configs/sim/axis/orphans/taskcall.ngc
diff --git a/configs/sim/axis/python_demo/README b/configs/sim/axis/python_demo/README
deleted file mode 100644
index a9498d6a6..000000000
--- a/configs/sim/axis/python_demo/README
+++ /dev/null
@@ -1,3 +0,0 @@
-python_demo
-
-Configs to demonstrate enhancements available using the python language
diff --git a/configs/sim/axis/python_demo/orient.txt b/configs/sim/axis/spindle_orient/README
index 0915c642e..0915c642e 100644
--- a/configs/sim/axis/python_demo/orient.txt
+++ b/configs/sim/axis/spindle_orient/README
diff --git a/configs/sim/axis/spindle_orient/axis_manualtoolchange.hal b/configs/sim/axis/spindle_orient/axis_manualtoolchange.hal
new file mode 120000
index 000000000..397c8934a
--- /dev/null
+++ b/configs/sim/axis/spindle_orient/axis_manualtoolchange.hal
@@ -0,0 +1 @@
+../../axis_manualtoolchange.hal
+\ No newline at end of file
diff --git a/configs/sim/axis/spindle_orient/core_sim.hal b/configs/sim/axis/spindle_orient/core_sim.hal
new file mode 120000
index 000000000..b79df2d33
--- /dev/null
+++ b/configs/sim/axis/spindle_orient/core_sim.hal
@@ -0,0 +1 @@
+../../core_sim.hal
+\ No newline at end of file
diff --git a/configs/sim/axis/python_demo/orient.hal b/configs/sim/axis/spindle_orient/orient.hal
index 8c1c13f57..8c1c13f57 100644
--- a/configs/sim/axis/python_demo/orient.hal
+++ b/configs/sim/axis/spindle_orient/orient.hal
diff --git a/configs/sim/axis/python_demo/orient.ini b/configs/sim/axis/spindle_orient/orient.ini
index 2c271ac23..2c271ac23 100644
--- a/configs/sim/axis/python_demo/orient.ini
+++ b/configs/sim/axis/spindle_orient/orient.ini
diff --git a/configs/sim/axis/python_demo/orient.ui b/configs/sim/axis/spindle_orient/orient.ui
index a24ce6797..a24ce6797 100644
--- a/configs/sim/axis/python_demo/orient.ui
+++ b/configs/sim/axis/spindle_orient/orient.ui
diff --git a/configs/sim/axis/spindle_orient/sim.tbl b/configs/sim/axis/spindle_orient/sim.tbl
new file mode 120000
index 000000000..1dccf4afb
--- /dev/null
+++ b/configs/sim/axis/spindle_orient/sim.tbl
@@ -0,0 +1 @@
+../../sim.tbl
+\ No newline at end of file
diff --git a/configs/sim/axis/spindle_orient/simulated_home.hal b/configs/sim/axis/spindle_orient/simulated_home.hal
new file mode 120000
index 000000000..a0e8e5601
--- /dev/null
+++ b/configs/sim/axis/spindle_orient/simulated_home.hal
@@ -0,0 +1 @@
+../../simulated_home.hal
+\ No newline at end of file
author	Dewey Garrett <dgarrett@panix.com>	2014-04-01 19:37:38 -0700
committer	Dewey Garrett <dgarrett@panix.com>	2014-04-03 08:40:10 -0700
commit	44f6bd51cce4afa42b31f42cdca2fb990a17f43f (patch)
tree	1021bc520de9ae83e71aa592d83343a967d5a2c6
parent	038de8d85401dd6a1a6a79817722e06eda258a31 (diff)
download	linuxcnc-44f6bd51cce4afa42b31f42cdca2fb990a17f43f.tar.gz linuxcnc-44f6bd51cce4afa42b31f42cdca2fb990a17f43f.zip