Skip to content

Commit ad08b1d

Browse files
committed
DEFAULT_LINEAR_VELOCITY: [TRAJ] -> [DISPLAY] TODO: update sample configs
1 parent 41d68b4 commit ad08b1d

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

docs/src/config/ini-config.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,8 +853,6 @@ Finally, no amount of tweaking will speed up a tool path with lots of small, tig
853853
* `ANGULAR_UNITS =` _<units>_ - (((ANGULAR UNITS))) Specifies the 'machine units' for rotational axes.
854854
Possible choices are 'deg', 'degree' (360 per circle), 'rad', 'radian' (2*π per circle), 'grad', or 'gon' (400 per circle).
855855
This does not affect the angular units of NC code. In RS274NGC, A-, B- and C- words are always expressed in degrees.
856-
* `DEFAULT_LINEAR_VELOCITY = 0.0167` - The initial rate for jogs of linear axes, in machine units per second.
857-
The value shown in 'AXIS' equals machine units per minute.
858856
* `DEFAULT_LINEAR_ACCELERATION = 2.0` - In machines with nontrivial kinematics, the acceleration used for "teleop" (Cartesian space) jogs, in 'machine units' per second per second.
859857
* `MAX_LINEAR_VELOCITY = 5.0` - (((MAX VELOCITY))) The maximum velocity for any axis or coordinated move, in 'machine units' per second.
860858
The value shown equals 300 units per minute.

share/gscreen/skins/silverdragon/silverdragon_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def initialize_preferences(self):
201201
default_spindle_speed = self.gscreen.inifile.find("DISPLAY", "DEFAULT_SPINDLE_SPEED")
202202
self.spindle_start_rpm = self.gscreen.prefs.getpref( 'spindle_start_rpm', default_spindle_speed, float )
203203
# get the values for the sliders
204-
default_jog_vel = float(self.gscreen.inifile.find("TRAJ", "DEFAULT_LINEAR_VELOCITY"))
204+
default_jog_vel = float(self.gscreen.inifile.find("DISPLAY", "DEFAULT_LINEAR_VELOCITY"))
205205
self.fast_jog = default_jog_vel
206206
self.slow_jog = default_jog_vel / self.slow_jog_factor
207207
self.jog_rate_max = self.gscreen.inifile.find("TRAJ", "MAX_LINEAR_VELOCITY")

src/emc/usr_intf/axis/scripts/axis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3414,7 +3414,7 @@ def units(s, d=1.0):
34143414
or None)
34153415
default_jog_linear_speed = (
34163416
inifile.find("DISPLAY", "DEFAULT_LINEAR_VELOCITY")
3417-
or inifile.find("TRAJ", "DEFAULT_LINEAR_VELOCITY")
3417+
or inifile.find("TRAJ", "DEFAULT_LINEAR_VELOCITY") # legacy
34183418
or None)
34193419

34203420
max_angular_speed = (

src/emc/usr_intf/pncconf/build_INI.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,6 @@ def write_inifile(self, base):
370370
else:
371371
maxvel = max(self.d.xmaxvel, self.d.ymaxvel, self.d.zmaxvel)
372372
hypotvel = (self.d.xmaxvel**2 + self.d.ymaxvel**2 + self.d.zmaxvel**2) **.5
373-
defvel = min(maxvel, max(.1, maxvel/10.))
374-
print("DEFAULT_LINEAR_VELOCITY = %.2f" % defvel, file=file)
375373
print("MAX_LINEAR_VELOCITY = %.2f" % maxvel, file=file)
376374
if self.d.restore_joint_position:
377375
print("POSITION_FILE = position.txt", file=file)

0 commit comments

Comments
 (0)