|
33 | 33 |
|
34 | 34 | from clearpath_config.clearpath_config import ClearpathConfig
|
35 | 35 | from clearpath_config.common.utils.dictionary import merge_dict, replace_dict_items
|
| 36 | +from clearpath_config.manipulators.types.arms import Franka, UniversalRobots |
| 37 | +from clearpath_config.manipulators.types.grippers import FrankaGripper |
36 | 38 | from clearpath_generator_common.common import MoveItParamFile, Package, ParamFile
|
37 | 39 | from clearpath_generator_common.param.writer import ParamWriter
|
38 | 40 |
|
@@ -103,12 +105,39 @@ def generate_parameters(self, use_sim_time: bool = False) -> None:
|
103 | 105 | parameters={}
|
104 | 106 | )
|
105 | 107 | arm_param_file.read()
|
| 108 | + |
| 109 | + # Franka Exception. Add Arm ID. |
| 110 | + if arm.MANIPULATOR_MODEL == Franka.MANIPULATOR_MODEL: |
| 111 | + updated_parameters = replace_dict_items( |
| 112 | + arm_param_file.parameters, |
| 113 | + {r'${name}': f'{arm.name}_{arm.arm_id}'} |
| 114 | + ) |
| 115 | + else: |
| 116 | + updated_parameters = replace_dict_items( |
| 117 | + arm_param_file.parameters, |
| 118 | + {r'${name}': arm.name} |
| 119 | + ) |
| 120 | + # UR Arm Exception. Update Rate |
| 121 | + if arm.MANIPULATOR_MODEL == UniversalRobots.MANIPULATOR_MODEL: |
| 122 | + try: |
| 123 | + # Update Rate from Parameter File |
| 124 | + update_rate_param_file = ParamFile( |
| 125 | + name=f'{arm.ur_type}_update_rate', |
| 126 | + package=Package('ur_robot_driver'), |
| 127 | + path='config', |
| 128 | + parameters={} |
| 129 | + ) |
| 130 | + update_rate_param_file.read() |
| 131 | + updated_parameters.update(update_rate_param_file.parameters) |
| 132 | + except Exception as e: |
| 133 | + print(f'Unable to get UniversalRobots {arm.ur_type}_' |
| 134 | + f'update_rate.yaml parameter file: {e.args[0]}') |
106 | 135 | updated_parameters = replace_dict_items(
|
107 |
| - arm_param_file.parameters, |
108 |
| - {r'${name}': arm.name} |
| 136 | + updated_parameters, |
| 137 | + {r'${controller_name}': arm.name} |
109 | 138 | )
|
110 | 139 | self.param_file.parameters = merge_dict(
|
111 |
| - self.param_file.parameters, updated_parameters) |
| 140 | + updated_parameters, self.param_file.parameters) |
112 | 141 | # Grippers
|
113 | 142 | for arm in self.clearpath_config.manipulators.get_all_arms():
|
114 | 143 | if not arm.gripper:
|
|
0 commit comments