configs: [TRAJ] rename velocity & accel items JA

An early joints_axes commit made corresponding code changes but
only a few ini files in tree were ever updated.

These renames clarify current functionality and should decrease future
ini updates if provisions are added to specify ANGULAR value items.

  [TRAJ]MAX_VELOCITY         --> [TRAJ]MAX_LINEAR_VELOCITY
  [TRAJ]DEFAULT_VELOCITY     --> [TRAJ]DEFAULT_LINEAR_VELOCITY

  [TRAJ]MAX_ACCELERATION     --> [TRAJ]MAX_LINEAR_ACCELERATION
  [TRAJ]DEFAULT_ACCELERATION --> [TRAJ]DEFAULT_LINEAR_ACCELERATION

It is possible that some existing ini files may need different values.

Ref:
http://git.linuxcnc.org/gitweb?p=linuxcnc.git;a=commitdiff;h=cdc073dc6068ec0e003b9d29ff1acaeb1a2c13b0

Signed-off-by: Dewey Garrett <dgarrett@panix.com>

configs/attic/dallur-thc/dallur-advanced.ini

@@ -106,10 +106,10 @@ HOME =                  0 0 0
 LINEAR_UNITS = 		mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.00001
-DEFAULT_VELOCITY =      180.00
+DEFAULT_LINEAR_VELOCITY = 180.00
-MAX_VELOCITY =          260.00
+MAX_LINEAR_VELOCITY = 260.00
-DEFAULT_ACCELERATION =  500.0
+DEFAULT_LINEAR_ACCELERATION = 500.0
-MAX_ACCELERATION =      2400.0
+MAX_LINEAR_ACCELERATION = 2400.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/attic/demo_mazak/demo_mazak.ini

@@ -97,10 +97,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      1.0
+DEFAULT_LINEAR_VELOCITY = 1.0
-MAX_VELOCITY =          5.0
+MAX_LINEAR_VELOCITY = 5.0
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_interface/general_mechatronics/GM6-PCI/3-axis-servo.ini

@@ -85,10 +85,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.424
+DEFAULT_LINEAR_VELOCITY = 0.424
-MAX_VELOCITY =          30.48
+MAX_LINEAR_VELOCITY = 30.48
-DEFAULT_ACCELERATION =  300.0
+DEFAULT_LINEAR_ACCELERATION = 300.0
-MAX_ACCELERATION =      500.0
+MAX_LINEAR_ACCELERATION = 500.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/general_mechatronics/GM6-PCI/3-axis-stepper.ini

@@ -85,10 +85,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.424
+DEFAULT_LINEAR_VELOCITY = 0.424
-MAX_VELOCITY =          30.48
+MAX_LINEAR_VELOCITY = 30.48
-DEFAULT_ACCELERATION =  300.0
+DEFAULT_LINEAR_ACCELERATION = 300.0
-MAX_ACCELERATION =      500.0
+MAX_LINEAR_ACCELERATION = 500.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/mesa/hm2-servo/3x20-small.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/4i65.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/4i68.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/5i20.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/5i22-big.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/5i22-small.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/5i23.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/7i43-big.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/7i43-small.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/hm2-servo/7i90.ini

@@ -74,10 +74,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 
 [EMCIO]
 # Name of IO controller program, e.g., io

configs/by_interface/mesa/plasma-5i20/plasma-demo.ini

@@ -58,7 +58,7 @@ COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.10
+DEFAULT_LINEAR_VELOCITY = 0.10
 MAX_LINEAR_VELOCITY = 1.00
 
 [EMCIO]

configs/by_interface/parport/classicladder/cl-estop/cl-estop.ini

@@ -51,7 +51,7 @@ COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.10
+DEFAULT_LINEAR_VELOCITY = 0.10
 MAX_LINEAR_VELOCITY = 1.00
 
 [EMCIO]

configs/by_interface/parport/classicladder/demo_step_cl/demo_step_cl.ini

@@ -90,10 +90,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.0167
+DEFAULT_LINEAR_VELOCITY = 0.0167
-MAX_VELOCITY =          1.2
+MAX_LINEAR_VELOCITY = 1.2
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_interface/parport/etch-servo/etch.ini

@@ -108,10 +108,10 @@ HOME =                  0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      1
+DEFAULT_LINEAR_VELOCITY = 1
-MAX_VELOCITY =          30
+MAX_LINEAR_VELOCITY = 30
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/parport/gantry/gantry-hs.ini

@@ -55,7 +55,7 @@ DEFAULT_ANGULAR_VELOCITY = 36.00
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.10
+DEFAULT_LINEAR_VELOCITY = 0.10
 MAX_LINEAR_VELOCITY = 1.00
 
 [EMCIO]

configs/by_interface/parport/gantry/gantry.ini

@@ -53,7 +53,7 @@ DEFAULT_ANGULAR_VELOCITY = 36.00
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.10
+DEFAULT_LINEAR_VELOCITY = 0.10
 MAX_LINEAR_VELOCITY = 1.00
 
 [EMCIO]

configs/by_interface/parport/gecko/Gecko_540B3/Gecko_540B3.ini

@@ -54,7 +54,7 @@ COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.10
+DEFAULT_LINEAR_VELOCITY = 0.10
 MAX_LINEAR_VELOCITY = 1.00
 
 [EMCIO]

configs/by_interface/parport/gecko/Gecko_540B4/Gecko_540B4.ini

@@ -54,7 +54,7 @@ COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.10
+DEFAULT_LINEAR_VELOCITY = 0.10
 MAX_LINEAR_VELOCITY = 1.00
 
 [EMCIO]

configs/by_interface/parport/nist-lathe/inch.ini

@@ -107,10 +107,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      .5
+DEFAULT_LINEAR_VELOCITY = .5
-MAX_VELOCITY =          .5
+MAX_LINEAR_VELOCITY = .5
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/parport/plasma-thc-sim/plasma_mm.ini

@@ -136,11 +136,11 @@ COORDINATES =		X Y Z A
 LINEAR_UNITS =		1.0
 ANGULAR_UNITS =         1.0
 #DEFAULT_VELOCITY =	100
-DEFAULT_VELOCITY =	40
+DEFAULT_LINEAR_VELOCITY = 40
 #MAX_VELOCITY =		180
-MAX_VELOCITY =		63
+MAX_LINEAR_VELOCITY = 63
-DEFAULT_ACCELERATION =	600
+DEFAULT_LINEAR_ACCELERATION = 600
-MAX_ACCELERATION =	2400
+MAX_LINEAR_ACCELERATION = 2400
 #POSITION_FILE =		last_position.txt
 ###############################################################################
 # Axes sections

configs/by_interface/parport/stepper-gantry/stepper_mm.ini

@@ -122,10 +122,10 @@ HALFILE =		estop.hal
 COORDINATES =		X Y Z A
 LINEAR_UNITS =		1.0
 ANGULAR_UNITS =         1.0
-DEFAULT_VELOCITY =	100
+DEFAULT_LINEAR_VELOCITY = 100
-MAX_VELOCITY =		180
+MAX_LINEAR_VELOCITY = 180
-DEFAULT_ACCELERATION =	600
+DEFAULT_LINEAR_ACCELERATION = 600
-MAX_ACCELERATION =	2400
+MAX_LINEAR_ACCELERATION = 2400
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/parport/stepper-xyza/inch.ini

@@ -109,12 +109,12 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      .2
+DEFAULT_LINEAR_VELOCITY = .2
 DEFAULT_ANGULAR_VELOCITY =      30
-MAX_VELOCITY =          1.2
+MAX_LINEAR_VELOCITY = 1.2
 MAX_ANGULAR_VELOCITY =          90
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      400.0
+MAX_LINEAR_ACCELERATION = 400.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/parport/stepper/sim_inch.ini

@@ -108,10 +108,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
-MAX_VELOCITY =          1.2
+MAX_LINEAR_VELOCITY = 1.2
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/parport/stepper/stepper_inch.ini

@@ -108,10 +108,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.0167
+DEFAULT_LINEAR_VELOCITY = 0.0167
-MAX_VELOCITY =          1.2
+MAX_LINEAR_VELOCITY = 1.2
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/parport/stepper/stepper_mm.ini

@@ -106,10 +106,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.424
+DEFAULT_LINEAR_VELOCITY = 0.424
-MAX_VELOCITY =          30.48
+MAX_LINEAR_VELOCITY = 30.48
-DEFAULT_ACCELERATION =  300.0
+DEFAULT_LINEAR_ACCELERATION = 300.0
-MAX_ACCELERATION =      500.0
+MAX_LINEAR_ACCELERATION = 500.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/pico/USC_encod/univstep.ini

@@ -85,10 +85,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.0167
+DEFAULT_LINEAR_VELOCITY = 0.0167
-MAX_VELOCITY =          1.20
+MAX_LINEAR_VELOCITY = 1.20
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_interface/pico/ppmc/ppmc.ini

@@ -88,10 +88,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.15
+DEFAULT_LINEAR_VELOCITY = 0.15
-MAX_VELOCITY =          1.20
+MAX_LINEAR_VELOCITY = 1.20
-DEFAULT_ACCELERATION =  1.5
+DEFAULT_LINEAR_ACCELERATION = 1.5
-MAX_ACCELERATION =      1.5
+MAX_LINEAR_ACCELERATION = 1.5
 # Axes sections ---------------------------------------------------------------
 # Scaling:  The OUTPUT_SCALE should be the speed 
 # in UNITS/second  (inches/sec or mm/sec) that would be

configs/by_interface/pico/ppmc_vel/ppmc.ini

@@ -88,10 +88,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.15
+DEFAULT_LINEAR_VELOCITY = 0.15
-MAX_VELOCITY =          1.20
+MAX_LINEAR_VELOCITY = 1.20
-DEFAULT_ACCELERATION =  1.5
+DEFAULT_LINEAR_ACCELERATION = 1.5
-MAX_ACCELERATION =      1.5
+MAX_LINEAR_ACCELERATION = 1.5
 # Axes sections ---------------------------------------------------------------
 # Scaling:  The OUTPUT_SCALE should be the speed 
 # in UNITS/second  (inches/sec or mm/sec) that would be

configs/by_interface/pico/univpwm/univpwm.ini

@@ -91,10 +91,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.0167
+DEFAULT_LINEAR_VELOCITY = 0.0167
-MAX_VELOCITY =          1.20
+MAX_LINEAR_VELOCITY = 1.20
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # Scaling:  The OUTPUT_SCALE should be the speed 
 # in UNITS/second  (inches/sec or mm/sec) that would be

configs/by_interface/pico/univpwmv/univpwm.ini

@@ -101,10 +101,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.15
+DEFAULT_LINEAR_VELOCITY = 0.15
-MAX_VELOCITY =          1.20
+MAX_LINEAR_VELOCITY = 1.20
-DEFAULT_ACCELERATION =  5.0
+DEFAULT_LINEAR_ACCELERATION = 5.0
-MAX_ACCELERATION =      5.0
+MAX_LINEAR_ACCELERATION = 5.0
 PROBE_INDEX =           0
 PROBE_POLARITY =        1
 # Axes sections ---------------------------------------------------------------

configs/by_interface/pico/univstep/univstep.ini

@@ -88,10 +88,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.0167
+DEFAULT_LINEAR_VELOCITY = 0.0167
-MAX_VELOCITY =          1.20
+MAX_LINEAR_VELOCITY = 1.20
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_interface/pluto/lathe-pluto/lathe-pluto.ini

@@ -47,10 +47,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          1.0
 ANGULAR_UNITS =         1.0
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      10
+DEFAULT_LINEAR_VELOCITY = 10
-MAX_VELOCITY =          32.5
+MAX_LINEAR_VELOCITY = 32.5
-DEFAULT_ACCELERATION =  400
+DEFAULT_LINEAR_ACCELERATION = 400
-MAX_ACCELERATION =      707
+MAX_LINEAR_ACCELERATION = 707
 
 [EMCIO]
 EMCIO = 		io

configs/by_interface/pluto/pluto_inch/pluto_inch.ini

@@ -103,10 +103,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
-MAX_VELOCITY =          1.2
+MAX_LINEAR_VELOCITY = 1.2
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/servotogo/stg.ini

@@ -104,10 +104,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.424
+DEFAULT_LINEAR_VELOCITY = 0.424
-MAX_VELOCITY =          30.48
+MAX_LINEAR_VELOCITY = 30.48
-DEFAULT_ACCELERATION =  300.0
+DEFAULT_LINEAR_ACCELERATION = 300.0
-MAX_ACCELERATION =      500.0
+MAX_LINEAR_ACCELERATION = 500.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/vigilant/vti.ini

@@ -104,10 +104,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      2.000
+DEFAULT_LINEAR_VELOCITY = 2.000
-MAX_VELOCITY =          30.48
+MAX_LINEAR_VELOCITY = 30.48
-DEFAULT_ACCELERATION =  300.0
+DEFAULT_LINEAR_ACCELERATION = 300.0
-MAX_ACCELERATION =      500.0
+MAX_LINEAR_ACCELERATION = 500.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_interface/vitalsystems/motenc.ini

@@ -84,10 +84,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      3.0
+DEFAULT_LINEAR_VELOCITY = 3.0
-MAX_VELOCITY =          4.0
+MAX_LINEAR_VELOCITY = 4.0
-DEFAULT_ACCELERATION =  6.0
+DEFAULT_LINEAR_ACCELERATION = 6.0
-MAX_ACCELERATION =      7.0
+MAX_LINEAR_ACCELERATION = 7.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/boss/boss.ini

@@ -88,13 +88,13 @@ LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
 # 2000 rpm, 2:1 reduction, 5 tpi = 200 ipm = 3.33333333333333 ips.
-MAX_VELOCITY =          2.5
+MAX_LINEAR_VELOCITY = 2.5
-DEFAULT_VELOCITY =      0.1
+DEFAULT_LINEAR_VELOCITY = 0.1
 # 3000 lbs continuous force. Use 1% = 30 lbs for accel. With 600 lbs load
 # that's 0.05g * 9.8 mpss * 39.37 i/m = 19.29 ipss. Motor peak torque
 # is 3x continuous.
-MAX_ACCELERATION =      15.0
+MAX_LINEAR_ACCELERATION = 15.0
-DEFAULT_ACCELERATION =  15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/boss/pid_test.ini

@@ -88,13 +88,13 @@ LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
 # 2000 rpm, 2:1 reduction, 5 tpi = 200 ipm = 3.33333333333333 ips.
-MAX_VELOCITY =          2.5
+MAX_LINEAR_VELOCITY = 2.5
-DEFAULT_VELOCITY =      0.1
+DEFAULT_LINEAR_VELOCITY = 0.1
 # 3000 lbs continuous force. Use 1% = 30 lbs for accel. With 600 lbs load
 # that's 0.05g * 9.8 mpss * 39.37 i/m = 19.29 ipss. Motor peak torque
 # is 3x continuous.
-MAX_ACCELERATION =      3.0
+MAX_LINEAR_ACCELERATION = 3.0
-DEFAULT_ACCELERATION =  3.0
+DEFAULT_LINEAR_ACCELERATION = 3.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Basic540_3axes.ini

@@ -92,10 +92,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      15
+DEFAULT_LINEAR_VELOCITY = 15
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Basic540_4axes.ini

@@ -92,10 +92,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      15
+DEFAULT_LINEAR_VELOCITY = 15
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Uni-cnc-set.ini

@@ -93,10 +93,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      2
+DEFAULT_LINEAR_VELOCITY = 2
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Uni-dreh-g.ini

@@ -93,10 +93,10 @@ HOME =                  0 0 0 0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      2
+DEFAULT_LINEAR_VELOCITY = 2
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Uni-dreh.ini

@@ -93,10 +93,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      2
+DEFAULT_LINEAR_VELOCITY = 2
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Uni-fraes-4.ini

@@ -93,10 +93,10 @@ HOME =                  0 0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      2
+DEFAULT_LINEAR_VELOCITY = 2
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Uni-fraes-h3.ini

@@ -93,10 +93,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      2
+DEFAULT_LINEAR_VELOCITY = 2
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Uni-fraes-v3.ini

@@ -92,10 +92,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      2
+DEFAULT_LINEAR_VELOCITY = 2
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/cooltool/Uni-mill-cnc.ini

@@ -92,10 +92,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      2
+DEFAULT_LINEAR_VELOCITY = 2
-MAX_VELOCITY =          50
+MAX_LINEAR_VELOCITY = 50
-DEFAULT_ACCELERATION =  20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION =      20.0
+MAX_LINEAR_ACCELERATION = 20.0
 # Axes sections ---------------------------------------------------------------
 # First axis
 

configs/by_machine/sherline/Sherline3Axis/Sherline3Axis_inch.ini

@@ -105,10 +105,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.18
+DEFAULT_LINEAR_VELOCITY = 0.18
-MAX_VELOCITY =          .36
+MAX_LINEAR_VELOCITY = .36
-DEFAULT_ACCELERATION =  2.0
+DEFAULT_LINEAR_ACCELERATION = 2.0
-MAX_ACCELERATION =      2.0
+MAX_LINEAR_ACCELERATION = 2.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_machine/sherline/Sherline3Axis/Sherline3Axis_mm.ini

@@ -105,10 +105,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      4.6
+DEFAULT_LINEAR_VELOCITY = 4.6
-MAX_VELOCITY =          8
+MAX_LINEAR_VELOCITY = 8
-DEFAULT_ACCELERATION =  50
+DEFAULT_LINEAR_ACCELERATION = 50
-MAX_ACCELERATION =      50
+MAX_LINEAR_ACCELERATION = 50
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_machine/sherline/Sherline4Axis/Sherline4Axis_inch.ini

@@ -107,12 +107,12 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      .2
+DEFAULT_LINEAR_VELOCITY = .2
 DEFAULT_ANGULAR_VELOCITY =      25
-MAX_VELOCITY =          25
+MAX_LINEAR_VELOCITY = 25
 MAX_ANGULAR_VELOCITY =          25
-DEFAULT_ACCELERATION =  2.0
+DEFAULT_LINEAR_ACCELERATION = 2.0
-MAX_ACCELERATION =      2.0
+MAX_LINEAR_ACCELERATION = 2.0
 # for gui only
 MAX_LINEAR_VELOCITY = .36
 DEFAULT_LINEAR_VELOCITY = .2

configs/by_machine/sherline/Sherline4Axis/Sherline4Axis_mm.ini

@@ -107,12 +107,12 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      4.6
+DEFAULT_LINEAR_VELOCITY = 4.6
 DEFAULT_ANGULAR_VELOCITY =      25
-MAX_VELOCITY =          25
+MAX_LINEAR_VELOCITY = 25
 MAX_ANGULAR_VELOCITY =          25
-DEFAULT_ACCELERATION =  50
+DEFAULT_LINEAR_ACCELERATION = 50
-MAX_ACCELERATION =      50
+MAX_LINEAR_ACCELERATION = 50
 # for gui only
 MAX_LINEAR_VELOCITY = 8
 DEFAULT_LINEAR_VELOCITY = 4.6

configs/by_machine/sherline/SherlineLathe/SherlineLathe_inch.ini

@@ -106,10 +106,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          inch
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      0.18
+DEFAULT_LINEAR_VELOCITY = 0.18
-MAX_VELOCITY =          .36
+MAX_LINEAR_VELOCITY = .36
-DEFAULT_ACCELERATION =  2.0
+DEFAULT_LINEAR_ACCELERATION = 2.0
-MAX_ACCELERATION =      2.0
+MAX_LINEAR_ACCELERATION = 2.0
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_machine/sherline/SherlineLathe/SherlineLathe_mm.ini

@@ -106,10 +106,10 @@ HOME =                  0 0 0
 LINEAR_UNITS =          mm
 ANGULAR_UNITS =         degree
 CYCLE_TIME =            0.010
-DEFAULT_VELOCITY =      4.6
+DEFAULT_LINEAR_VELOCITY = 4.6
-MAX_VELOCITY =          8
+MAX_LINEAR_VELOCITY = 8
-DEFAULT_ACCELERATION =  50
+DEFAULT_LINEAR_ACCELERATION = 50
-MAX_ACCELERATION =      50
+MAX_LINEAR_ACCELERATION = 50
 ###############################################################################
 # Axes sections
 ###############################################################################

configs/by_machine/smithy/1034gecko.ini

@@ -100,9 +100,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z A
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 2.0
+MAX_LINEAR_VELOCITY = 2.0
-MAX_ACCELERATION = 1.5
+MAX_LINEAR_ACCELERATION = 1.5
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1240.ini

@@ -104,9 +104,9 @@ LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 #MAX_VELOCITY = 7.0
 #MAX_ACCELERATION = 20.0
-MAX_VELOCITY = 5.0
+MAX_LINEAR_VELOCITY = 5.0
-MAX_ACCELERATION = 7.5
+MAX_LINEAR_ACCELERATION = 7.5
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1240_4axis.ini

@@ -104,9 +104,9 @@ LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 #MAX_VELOCITY = 7.0
 #MAX_ACCELERATION = 20.0
-MAX_VELOCITY = 5.0
+MAX_LINEAR_VELOCITY = 5.0
-MAX_ACCELERATION = 7.5
+MAX_LINEAR_ACCELERATION = 7.5
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1240combined.ini

@@ -109,9 +109,9 @@ ANGULAR_UNITS = degree
 # @SCALE = 25600
 #MAX_VELOCITY = 1.9
 # @SCALE = 10000
-MAX_VELOCITY = 4.2
+MAX_LINEAR_VELOCITY = 4.2
-MAX_ACCELERATION = 10.0
+MAX_LINEAR_ACCELERATION = 10.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1240combined_4axis.ini

@@ -109,9 +109,9 @@ ANGULAR_UNITS = degree
 # @SCALE = 25600
 #MAX_VELOCITY = 1.9
 # @SCALE = 10000
-MAX_VELOCITY = 4.2
+MAX_LINEAR_VELOCITY = 4.2
-MAX_ACCELERATION = 10.0
+MAX_LINEAR_ACCELERATION = 10.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1240combined_mm.ini

@@ -105,8 +105,8 @@ COORDINATES = X Y Z
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
 MAX_LINEAR_VELOCITY = 124.46
-MAX_ACCELERATION = 254.0
+MAX_LINEAR_ACCELERATION = 254.0
-DEFAULT_VELOCITY = 5.08
+DEFAULT_LINEAR_VELOCITY = 5.08
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1240gecko.ini

@@ -101,9 +101,9 @@ POSTGUI_HALFILE = gecko_postgui.hal
 COORDINATES = X Y Z A
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 2.0
+MAX_LINEAR_VELOCITY = 2.0
-MAX_ACCELERATION = 1.5
+MAX_LINEAR_ACCELERATION = 1.5
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1240rutex.ini

@@ -100,9 +100,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 3.0
+MAX_LINEAR_VELOCITY = 3.0
-MAX_ACCELERATION = 3.0
+MAX_LINEAR_ACCELERATION = 3.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1240rutex_4axis.ini

@@ -100,9 +100,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z A
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 3.0
+MAX_LINEAR_VELOCITY = 3.0
-MAX_ACCELERATION = 3.0
+MAX_LINEAR_ACCELERATION = 3.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/1315.ini

@@ -81,8 +81,8 @@ COORDINATES = X Z
 HOME = 0 0
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 1.5
+MAX_LINEAR_VELOCITY = 1.5
-MAX_ACCELERATION = 5.0
+MAX_LINEAR_ACCELERATION = 5.0
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/516gecko.ini

@@ -100,9 +100,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z A
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 1.5
+MAX_LINEAR_VELOCITY = 1.5
-MAX_ACCELERATION = 1.5
+MAX_LINEAR_ACCELERATION = 1.5
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/622.ini

@@ -101,9 +101,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 3.0
+MAX_LINEAR_VELOCITY = 3.0
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/622_4axis.ini

@@ -101,9 +101,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z A
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 3.0
+MAX_LINEAR_VELOCITY = 3.0
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/622gecko.ini

@@ -100,9 +100,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z A
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 1.5
+MAX_LINEAR_VELOCITY = 1.5
-MAX_ACCELERATION = 1.5
+MAX_LINEAR_ACCELERATION = 1.5
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/622keyence.ini

@@ -103,9 +103,9 @@ POSTGUI_HALFILE = keyence_postgui.hal
 COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 3.0
+MAX_LINEAR_VELOCITY = 3.0
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/622leadshine.ini

@@ -101,9 +101,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 3.0
+MAX_LINEAR_VELOCITY = 3.0
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/622leadshine_4axis.ini

@@ -101,9 +101,9 @@ HALFILE = axis_manualtoolchange.hal
 COORDINATES = X Y Z A
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 3.0
+MAX_LINEAR_VELOCITY = 3.0
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/smithy/924.ini

@@ -84,9 +84,9 @@ HALFILE = 924.hal
 COORDINATES = X Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
-MAX_VELOCITY = 3.93
+MAX_LINEAR_VELOCITY = 3.93
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
-DEFAULT_VELOCITY = 0.2
+DEFAULT_LINEAR_VELOCITY = 0.2
 
 [EMCIO]
 EMCIO = io

configs/by_machine/tormach/pcnc-1100-seriesII.ini

@@ -56,7 +56,7 @@ DEFAULT_ANGULAR_VELOCITY = 3.00
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.13
+DEFAULT_LINEAR_VELOCITY = 0.13
 MAX_LINEAR_VELOCITY = 1.50
 NO_FORCE_HOMING = 1
 

configs/by_machine/tormach/pcnc-770.ini

@@ -56,7 +56,7 @@ DEFAULT_ANGULAR_VELOCITY = 3.00
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.13
+DEFAULT_LINEAR_VELOCITY = 0.13
 MAX_LINEAR_VELOCITY = 2.25
 NO_FORCE_HOMING = 1
 

configs/sim/axis/canterp.ini

@@ -42,7 +42,7 @@ COORDINATES = X Y Z
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
 MAX_LINEAR_VELOCITY = 1.2
 
 [KINS]

configs/sim/axis/classicladder/demo_sim_cl.ini

@@ -40,10 +40,10 @@ COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.0167
+DEFAULT_LINEAR_VELOCITY = 0.0167
-MAX_VELOCITY = 1.2
+MAX_LINEAR_VELOCITY = 1.2
-DEFAULT_ACCELERATION = 15.0
+DEFAULT_LINEAR_ACCELERATION = 15.0
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
 
 [EMCIO]
 EMCIO =   io

configs/sim/axis/foam/axis_foam.ini

@@ -51,7 +51,7 @@ COORDINATES = X Y U V
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 1.0
+DEFAULT_LINEAR_VELOCITY = 1.0
 DEFAULT_ANGULAR_VELOCITY = 45.0
 MAX_LINEAR_VELOCITY = 1.2
 MAX_ANGULAR_VELOCITY = 90.0

configs/sim/axis/gantry.ini

@@ -56,8 +56,8 @@ COORDINATES = XYZY
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 1.0
+DEFAULT_LINEAR_VELOCITY = 1.0
-MAX_VELOCITY = 58
+MAX_LINEAR_VELOCITY = 58
 MAX_LINEAR_VELOCITY = 58
 #DEFAULT_ACCELERATION = 20.0
 #MAX_ACCELERATION = 20.0

configs/sim/axis/gladevcp/gladevcp_panel.ini

@@ -55,7 +55,7 @@ HOME = 0 0 0
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
 POSITION_FILE = position.txt
 MAX_LINEAR_VELOCITY = 1.2
 NO_FORCE_HOMING = 1

configs/sim/axis/gladevcp/gladevcp_tab.ini

@@ -59,7 +59,7 @@ HOME = 0 0 0
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
 POSITION_FILE = position.txt
 MAX_LINEAR_VELOCITY = 1.2
 NO_FORCE_HOMING = 1

configs/sim/axis/gladevcp/probe.ini

@@ -55,7 +55,7 @@ HOME = 0 0 0
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
 POSITION_FILE = position.txt
 MAX_LINEAR_VELOCITY = 1.2
 NO_FORCE_HOMING = 1

configs/sim/axis/gladevcp/set-param-from-ini.ini

@@ -54,7 +54,7 @@ HOME = 0 0 0
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
 POSITION_FILE = position.txt
 MAX_LINEAR_VELOCITY = 1.2
 NO_FORCE_HOMING = 1

configs/sim/axis/halui_pyvcp/halui.ini

@@ -45,10 +45,10 @@ COORDINATES = X Y Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 0.0167
+DEFAULT_LINEAR_VELOCITY = 0.0167
-MAX_VELOCITY = 1.2
+MAX_LINEAR_VELOCITY = 1.2
-DEFAULT_ACCELERATION = 20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
 
 [EMCIO]
 EMCIO = io

configs/sim/axis/histogram_demo.ini

@@ -55,9 +55,9 @@ COORDINATES         = X Y Z
 LINEAR_UNITS        = inch
 ANGULAR_UNITS       = degree
 CYCLE_TIME          = 0.010
-DEFAULT_VELOCITY    = 1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
 MAX_LINEAR_VELOCITY = 1.2
-MAX_VELOCITY        = 1.2345
+MAX_LINEAR_VELOCITY = 1.2345
 
 [EMCIO]
 EMCIO                = io

configs/sim/axis/historical_lathe.ini

@@ -53,10 +53,10 @@ COORDINATES = X Z
 LINEAR_UNITS = inch
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 1.0
+DEFAULT_LINEAR_VELOCITY = 1.0
-MAX_VELOCITY = 3.333334
+MAX_LINEAR_VELOCITY = 3.333334
-DEFAULT_ACCELERATION = 20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
 
 [EMCIO]
 EMCIO =   io

configs/sim/axis/ini_hal_demo.ini

@@ -58,9 +58,9 @@ COORDINATES         = X Y Z
 LINEAR_UNITS        = inch
 ANGULAR_UNITS       = degree
 CYCLE_TIME          = 0.010
-DEFAULT_VELOCITY    = 1.2
+DEFAULT_LINEAR_VELOCITY = 1.2
 MAX_LINEAR_VELOCITY = 1.2
-MAX_VELOCITY        = 1.2345
+MAX_LINEAR_VELOCITY = 1.2345
 
 [EMCIO]
 EMCIO                = io

configs/sim/axis/ini_with_includes/traj.inc

@@ -4,6 +4,6 @@ COORDINATES         = X Y Z
 LINEAR_UNITS        = inch
 ANGULAR_UNITS       = degree
 CYCLE_TIME          = 0.010
-DEFAULT_VELOCITY    = 10
+DEFAULT_LINEAR_VELOCITY = 10
 POSITION_FILE       = position.txt
 MAX_LINEAR_VELOCITY = 10

configs/sim/axis/iocontrolv2/axis-iocontrolv2-demo.ini

@@ -58,10 +58,10 @@ COORDINATES = X Y Z
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 30.48
+DEFAULT_LINEAR_VELOCITY = 30.48
-MAX_VELOCITY = 53.34
+MAX_LINEAR_VELOCITY = 53.34
-DEFAULT_ACCELERATION = 508
+DEFAULT_LINEAR_ACCELERATION = 508
-MAX_ACCELERATION = 508
+MAX_LINEAR_ACCELERATION = 508
 POSITION_FILE = position_mm.txt
 
 [EMCIO]

configs/sim/axis/iocontrolv2/g8812.ini

@@ -107,10 +107,10 @@ COORDINATES = X Y Z
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 30.48
+DEFAULT_LINEAR_VELOCITY = 30.48
-MAX_VELOCITY = 53.34
+MAX_LINEAR_VELOCITY = 53.34
-DEFAULT_ACCELERATION = 508
+DEFAULT_LINEAR_ACCELERATION = 508
-MAX_ACCELERATION = 508
+MAX_LINEAR_ACCELERATION = 508
 POSITION_FILE = position_mm.txt
 NO_FORCE_HOMING = 1
 

configs/sim/axis/iocontrolv2/m66track.ini

@@ -88,10 +88,10 @@ COORDINATES = X Y Z
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 30.48
+DEFAULT_LINEAR_VELOCITY = 30.48
-MAX_VELOCITY = 53.34
+MAX_LINEAR_VELOCITY = 53.34
-DEFAULT_ACCELERATION = 508
+DEFAULT_LINEAR_ACCELERATION = 508
-MAX_ACCELERATION = 508
+MAX_LINEAR_ACCELERATION = 508
 POSITION_FILE = position_mm.txt
 NO_FORCE_HOMING = 1
 

configs/sim/axis/iocontrolv2/owordm6-ui-ns.ini

@@ -89,10 +89,10 @@ COORDINATES = X Y Z
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 30.48
+DEFAULT_LINEAR_VELOCITY = 30.48
-MAX_VELOCITY = 53.34
+MAX_LINEAR_VELOCITY = 53.34
-DEFAULT_ACCELERATION = 508
+DEFAULT_LINEAR_ACCELERATION = 508
-MAX_ACCELERATION = 508
+MAX_LINEAR_ACCELERATION = 508
 POSITION_FILE = position_mm.txt
 NO_FORCE_HOMING = 1
 

configs/sim/axis/iocontrolv2/owordm6-ui.ini

@@ -70,10 +70,10 @@ COORDINATES = X Y Z
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
 CYCLE_TIME = 0.010
-DEFAULT_VELOCITY = 30.48
+DEFAULT_LINEAR_VELOCITY = 30.48
-MAX_VELOCITY = 53.34
+MAX_LINEAR_VELOCITY = 53.34
-DEFAULT_ACCELERATION = 508
+DEFAULT_LINEAR_ACCELERATION = 508
-MAX_ACCELERATION = 508
+MAX_LINEAR_ACCELERATION = 508
 POSITION_FILE = position_mm.txt
 
 [EMCIO]

configs/sim/axis/ja_tests/xz/xzbase.inc

@@ -7,10 +7,10 @@ HALFILE = LIB:basic_sim.tcl
         LINEAR_UNITS = inch
        ANGULAR_UNITS = degree
           CYCLE_TIME = 0.010
-    DEFAULT_VELOCITY = 1.0
+DEFAULT_LINEAR_VELOCITY = 1.0
-DEFAULT_ACCELERATION = 20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-        MAX_VELOCITY = 4.44444
+MAX_LINEAR_VELOCITY = 4.44444
-    MAX_ACCELERATION = 22.2222
+MAX_LINEAR_ACCELERATION = 22.2222
 
 [DISPLAY]
              DISPLAY = axis

configs/sim/axis/lathe-fanucy/lathe-fanucy.ini

@@ -48,10 +48,10 @@ HALFILE = LIB:basic_sim.tcl
         LINEAR_UNITS = inch
        ANGULAR_UNITS = degree
           CYCLE_TIME = 0.010
-    DEFAULT_VELOCITY = 1.0
+DEFAULT_LINEAR_VELOCITY = 1.0
-        MAX_VELOCITY = 3.333333
+MAX_LINEAR_VELOCITY = 3.333333
-DEFAULT_ACCELERATION = 20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-    MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
 
 [EMCIO]
                       EMCIO = io

configs/sim/axis/lathe.ini

@@ -49,10 +49,10 @@ POSTGUI_HALFILE = lathe_postgui.hal
         LINEAR_UNITS = inch
        ANGULAR_UNITS = degree
           CYCLE_TIME = 0.010
-    DEFAULT_VELOCITY = 1.0
+DEFAULT_LINEAR_VELOCITY = 1.0
-        MAX_VELOCITY = 3.333334
+MAX_LINEAR_VELOCITY = 3.333334
-DEFAULT_ACCELERATION = 20.0
+DEFAULT_LINEAR_ACCELERATION = 20.0
-    MAX_ACCELERATION = 20.0
+MAX_LINEAR_ACCELERATION = 20.0
 
 [EMCIO]
                       EMCIO = io

configs/sim/axis/ldelta.ini

@@ -52,7 +52,7 @@ HALUI = halui
 COORDINATES = X Y Z A
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
-DEFAULT_VELOCITY = 10
+DEFAULT_LINEAR_VELOCITY = 10
 MAX_LINEAR_VELOCITY = 10
 
 [KINS]

configs/sim/axis/ldelta_demo.ini

@@ -99,7 +99,7 @@ APP = sim_pin >/dev/null \
 COORDINATES = X Y Z A
 LINEAR_UNITS = mm
 ANGULAR_UNITS = degree
-DEFAULT_VELOCITY = 10
+DEFAULT_LINEAR_VELOCITY = 10
 MAX_LINEAR_VELOCITY = 10
 
 [KINS]