Skip to content

Commit 39e858b

Browse files
committed
comments
1 parent 1231d56 commit 39e858b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

resources/external_control.urscript

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,9 @@ thread script_commands():
514514
force_type = raw_command[20] / MULT_jointstate
515515
force_limits = [raw_command[21] / MULT_jointstate, raw_command[22] / MULT_jointstate, raw_command[23] / MULT_jointstate, raw_command[24] / MULT_jointstate, raw_command[25] / MULT_jointstate, raw_command[26] / MULT_jointstate]
516516
force_mode_set_damping(raw_command[27] / MULT_jointstate)
517+
# Check whether script is running on CB3 or e-series. Gain scaling can only be set on e-series robots.
518+
# step time = 0.008: CB3 robot
519+
# Step time = 0.002: e-series robot
517520
if (get_steptime() < 0.008):
518521
force_mode_set_gain_scaling(raw_command[28] / MULT_jointstate)
519522
end

src/ur/ur_driver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ bool UrDriver::setToolVoltage(const ToolVoltage voltage)
352352
return sendScript(cmd.str());
353353
}
354354
}
355-
// Function for e-series robots
355+
// Function for e-series robots (Needs both damping factor and gain scaling factor)
356356
bool UrDriver::startForceMode(const vector6d_t& task_frame, const vector6uint32_t& selection_vector,
357357
const vector6d_t& wrench, const unsigned int type, const vector6d_t& limits,
358358
double damping_factor, double gain_scaling_factor)
@@ -410,7 +410,7 @@ bool UrDriver::startForceMode(const vector6d_t& task_frame, const vector6uint32_
410410
}
411411
}
412412

413-
// Function for CB3 robots
413+
// Function for CB3 robots (CB3 robots cannot set gain scaling)
414414
bool UrDriver::startForceMode(const vector6d_t& task_frame, const vector6uint32_t& selection_vector,
415415
const vector6d_t& wrench, const unsigned int type, const vector6d_t& limits,
416416
double damping_factor)

0 commit comments

Comments
 (0)