diff --git a/configs/sim/axis/vismach/rolfmill/rolfmill b/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial similarity index 99% rename from configs/sim/axis/vismach/rolfmill/rolfmill rename to configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial index c75b52b46fc..478013e77e4 100755 --- a/configs/sim/axis/vismach/rolfmill/rolfmill +++ b/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial @@ -1,5 +1,7 @@ #!/usr/bin/python +# Rolf Redford, Nov 2018 + #import libraries from vismach import * import hal @@ -21,7 +23,7 @@ s.poll() # tooldiameter isn't really used but if you are using 2.8 you can make couple changes # in this file, and uncomment last line in HAL file. # add joints. Mill has 3. -c = hal.component("rolfmill") +c = hal.component("3axis-tutorial") c.newpin("jointX", hal.HAL_FLOAT, hal.HAL_IN) c.newpin("jointY", hal.HAL_FLOAT, hal.HAL_IN) c.newpin("jointZ", hal.HAL_FLOAT, hal.HAL_IN) diff --git a/configs/sim/axis/vismach/rolfmill/rolfmill.hal b/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial.hal similarity index 85% rename from configs/sim/axis/vismach/rolfmill/rolfmill.hal rename to configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial.hal index cfeb879bc9b..aa04e3b3649 100644 --- a/configs/sim/axis/vismach/rolfmill/rolfmill.hal +++ b/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial.hal @@ -52,17 +52,17 @@ net tool-changed iocontrol.0.tool-changed <= hal_manualtoolchange.changed net tool-number iocontrol.0.tool-prep-number => hal_manualtoolchange.number net tool-prepare-loopback iocontrol.0.tool-prepare => iocontrol.0.tool-prepared -# start rolfmill vismach addition -loadusr -W ./rolfmill +# start 3axis-tutorial vismach addition +loadusr -W ./3axis-tutorial # "wire" linuxcnc pins to joints defined in vismach file -net j0 joint.0.pos-fb => rolfmill.jointX -net j1 joint.1.pos-fb => rolfmill.jointY -net j2 joint.2.pos-fb => rolfmill.jointZ +net j0 joint.0.pos-fb => 3axis-tutorial.jointX +net j1 joint.1.pos-fb => 3axis-tutorial.jointY +net j2 joint.2.pos-fb => 3axis-tutorial.jointZ #tool sinput -net tool_len rolfmill.toollength <= motion.tooloffset.z -#net tool_rad halui.tool.diameter rolfmill.tooldiameter # Only in 2.8 or later +net tool_len 3axis-tutorial.toollength <= motion.tooloffset.z +net tool_rad halui.tool.diameter 3axis-tutorial.tooldiameter # Only in 2.8 or later diff --git a/configs/sim/axis/vismach/rolfmill/rolfmill.ini b/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial.ini similarity index 96% rename from configs/sim/axis/vismach/rolfmill/rolfmill.ini rename to configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial.ini index b6a11d38758..3ea54421818 100644 --- a/configs/sim/axis/vismach/rolfmill/rolfmill.ini +++ b/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial.ini @@ -14,7 +14,7 @@ VERSION = 1.0 # Name of machine, for use with display, etc. -MACHINE = rolfmill +MACHINE = 3axis-tutorial # Debug level, 0 means no messages. See src/emc/nml_int/emcglb.h for others # DEBUG = 0x7FFFFFFF @@ -42,7 +42,7 @@ POSITION_FEEDBACK = ACTUAL MAX_FEED_OVERRIDE = 1.2 MAX_SPINDLE_OVERRIDE = 1.0 # Prefix to be used -PROGRAM_PREFIX =/home/rolf/linuxcnc/nc_files +PROGRAM_PREFIX =/home/rolf/linuxcnc/nc_files #need to change # Introductory graphic INTRO_GRAPHIC = linuxcnc.gif @@ -66,7 +66,7 @@ py = python [RS274NGC] # File containing interpreter variables -PARAMETER_FILE = rolfmill_mm.var +PARAMETER_FILE = 3axis-tutorial_mm.var # Motion control section ------------------------------------------------------ [EMCMOT] @@ -102,7 +102,7 @@ CYCLE_TIME = 0.001 # list of hal config files to run through halcmd # files are executed in the order in which they appear -HALFILE = rolfmill.hal +HALFILE = 3axis-tutorial.hal # list of halcmd commands to execute # commands are executed in the order in which they appear @@ -220,4 +220,4 @@ MIN_LIMIT = -240.0 MAX_LIMIT = 0.001 HOME_OFFSET = 0.0 -# section for main IO controller parameters ----------------------------------- \ No newline at end of file +# section for main IO controller parameters ----------------------------------- diff --git a/configs/sim/axis/vismach/3axis-tutorial/README b/configs/sim/axis/vismach/3axis-tutorial/README new file mode 100644 index 00000000000..652228288aa --- /dev/null +++ b/configs/sim/axis/vismach/3axis-tutorial/README @@ -0,0 +1,2 @@ +A simple vismach 3 axis mill example built using primitives. +Comments is in 3axis-tutorial vismach file, and some in 3axis-tutorial.hal explains step by step the process to build. diff --git a/configs/sim/axis/vismach/rolfmill/tool.tbl b/configs/sim/axis/vismach/3axis-tutorial/tool.tbl similarity index 100% rename from configs/sim/axis/vismach/rolfmill/tool.tbl rename to configs/sim/axis/vismach/3axis-tutorial/tool.tbl diff --git a/configs/sim/axis/vismach/rolfmill/README b/configs/sim/axis/vismach/rolfmill/README deleted file mode 100644 index 2f61da0a5c3..00000000000 --- a/configs/sim/axis/vismach/rolfmill/README +++ /dev/null @@ -1,2 +0,0 @@ -A simple vismach 3 axis mill example built using primitives. -Comments in rolfmill.hal explain step by step the process to build.