Skip to content

Commit d2cfcb2

Browse files
authored
Fix: Generic (#280)
* Check for generic before creating drivetrain parameters * Add teleop_joy default parameter file for generic robot * Generic teleop values * Generic control file without a controller * Generic empty robot * Update path to cvontrol in empty generic URDF
1 parent 5ff311b commit d2cfcb2

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
controller_manager:
2+
ros__parameters:
3+
update_rate: 20 # Hz
4+
use_sim_time: False
5+
6+
joint_state_broadcaster.type: joint_state_broadcaster/JointStateBroadcaster
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Generic default Joy Teleop velocity limits
2+
teleop_twist_joy_node:
3+
ros__parameters:
4+
# Regular
5+
scale_linear.x: 1.0
6+
scale_linear.y: 1.0
7+
scale_angular.yaw: 1.0
8+
9+
# Turbo
10+
scale_linear_turbo.x: 2.0
11+
scale_linear_turbo.y: 2.0
12+
scale_angular_turbo.yaw: 2.0

clearpath_generator_common/clearpath_generator_common/param/platform.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,8 +774,9 @@ def __init__(self,
774774
clearpath_config: ClearpathConfig,
775775
param_path: str) -> None:
776776
super().__init__(parameter, clearpath_config, param_path)
777-
self.default_parameter_file_path = f'config/{self.platform}/control'
778-
self.default_parameter = self.clearpath_config.platform.drivetrain.control
777+
if self.platform != Platform.GENERIC:
778+
self.default_parameter_file_path = f'config/{self.platform}/control'
779+
self.default_parameter = self.clearpath_config.platform.drivetrain.control
779780

780781
class TeleopInteractiveMarkers(BaseParam):
781782
def __init__(self,
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<robot name="empty" xmlns:xacro="http://www.ros.org/wiki/xacro">
3+
<xacro:arg name="is_sim" default="false" />
4+
<xacro:arg name="prefix" default="" />
5+
<xacro:arg name="namespace" default="" />
6+
<xacro:arg name="gazebo_controllers" default="$(find clearpath_control)/config/generic/control/empty.yaml"/>
7+
<xacro:arg name="use_platform_controllers" default="true"/>
8+
<link name="base_link"/>
9+
<link name="default_mount"/>
10+
<joint name="default_mount_joint" type="fixed">
11+
<child link="default_mount"/>
12+
<parent link="base_link"/>
13+
<origin xyz="0 0 0" rpy="0 0 0"/>
14+
</joint>
15+
</robot>

0 commit comments

Comments
 (0)