Commit graph

338 commits

Author SHA1 Message Date
748ab2b7b1 update domain name in requirements.txt 2024-12-09 12:50:03 +03:00
ef4b015491 Add assembly configuration integration and refactor launches
- **Added support for assembly configuration in `rbs_bringup` and `rbs_robot` launches**:
  - Introduced new launch arguments: `use_rbs_utils` and `assembly_config_name`.
  - Integrated `rbs_utils`'s `utils.launch.py` for handling assembly configurations.
- **Simplified `skills.launch.py`**:
  - Removed redundant `assembly_config` node setup.
- **Enhanced `rbs_utils`**:
  - Added installation of `launch` files in `CMakeLists.txt`.
  - Created a new `utils.launch.py` for dynamically loading assembly configurations.
  - Refactored `assembly_config_service.py` to utilize `get_asm_config` for streamlined configuration file resolution.
- Improved `rbs_bringup` setup to include additional parameters and nodes for assembly configuration.

These changes centralize assembly configuration handling and enhance modularity across launch setups.
2024-12-06 12:14:29 +03:00
b1e20696fe Refactor robot arm and runtime initialization logic
- Updated error message in `rbs_arm.py` to use the complete joint names for improved clarity.
- Refactored `scene.py` to replace asynchronous parameter retrieval with synchronous methods for reliability and simplified implementation.
- Enhanced `runtime.launch.py`:
  - Added new launch arguments `use_rbs_utils` and `assembly_config_name`.
  - Included additional parameters in runtime node initialization.
  - Adjusted runtime node arguments for debugging and clarity.
- Updated `runtime.py`:
  - Introduced `MultiThreadedExecutor` for improved threading and node handling.
  - Refactored the `main` function for cleaner node lifecycle management.
2024-12-06 12:10:35 +03:00
1addd4f595 update documentation and gitignore 2024-12-06 12:05:53 +03:00
e8e6c052b0 refactor(launch): update launch configuration for real_robot and cleanup
- Add controller manager node when `real_robot` flag is set
- Remove unused Open3D dependency
2024-12-01 17:33:22 +03:00
fd0bb140cf update Russian installation guide with git LFS instructions
- Corrected language in installation steps for clarity.
- Added a note emphasizing the requirement to install `git lfs` for handling large files in `rbs_assets_library`.
- Improved formatting for better readability in the guide.
2024-12-01 14:55:07 +03:00
f14359c81c add support for real robot mode in runtime launch
- Added a new `real_robot` launch argument with default set to "false".
- Updated `launch_setup` to handle `real_robot` configuration, allowing selective use of `rbs_robot_setup`.
- Updated `requirements.txt` to replace a static library reference with a GitHub repository link for `rbs_assets_library`.
2024-12-01 00:54:06 +03:00
c4c13d55b1 enhance skill server parameter handling and assembly service
- Unified `base_link` and `ee_link` parameter usage across launch files and skill server components.
- Improved synchronization in `mtjs_jtc` and `mtp_jtc` with a timeout mechanism for joint position updates, adding error handling when data is unavailable.
- Extended `AssemblyConfigService` to broadcast TF transforms for relative parts during initialization.
- Enhanced YAML parsing for `AssemblyConfigService` to handle missing orientations with default values.
- Updated `mtp_jtc_cart` to align parameter names with other skill server components.
- Added single-threaded executor to `AssemblyConfigService` for better lifecycle management.
2024-11-30 19:32:37 +03:00
de0d5d4440 refactor launch configuration for robot and environment setup
- Simplified and consolidated launch arguments by removing unused configurations.
- Enhanced `test_env.launch.py` to support dynamic loading of xacro and SRDF arguments via YAML files.
- Added new launch parameters for control space, strategy, and interactive mode to improve flexibility.
- Updated robot description and MoveIt integration to use dynamic configurations.
- Improved clarity and modularity in scene and robot setup processes.
2024-11-30 19:30:13 +03:00
48e8668136 add dynamic terrain and TF broadcaster support
- Added `RandomGround` terrain model for random ground generation with texture randomization.
- Integrated `Tf2DynamicBroadcaster` for dynamic TF broadcasting.
- Enhanced the `Scene` class to support dynamic terrain and marker publishing.
- Updated imports to include new utilities and modules for dynamic broadcasting and terrain handling.
2024-11-30 19:26:09 +03:00
1f879e2dd6 update custom package repository URLs
Replaced URLs for custom Python packages in `requirements.txt` to point to a new `devpi.narmak.xyz` repository.
2024-11-30 19:23:13 +03:00
d0788041e9 refactor launch files for enhanced MoveIt integration and cleanup
- **RBS Bringup Launch File:**
  - Enabled MoveIt by default (`use_moveit: true`).
  - Removed unused arguments (`gripper_name`, `hardware`) for cleaner configuration.
  - Updated `robot_description_kinematics` to use the new kinematics file path handling.

- **RBS Robot Launch File:**
  - Streamlined robot description setup, removing unnecessary parameters like `gripper_name`, `hardware`, and pose arguments (`x`, `y`, `z`, `roll`, etc.).
  - Updated robot description and semantic description to use launch configurations.
  - Refactored kinematics file handling for clarity.

- **Skills Launch File:**
  - Updated kinematics YAML loading to use `load_yaml_abs` for absolute path resolution.
  - Standardized `robot_description`, `robot_description_semantic`, and `kinematics` parameters.

- **General Improvements:**
  - Consolidated redundant logic across launch files.
  - Improved maintainability by removing hardcoded and unused configurations.
2024-11-22 02:16:20 +03:00
fbddca1b8b refactor and extend runtime configuration handling
- **Scene configuration:**
  - Replaced `bishop` object with `hole` and added a new `peg` object.
  - Enhanced object properties with new attributes like `randomize`, `relative_to`, `static`, and `texture`.
  - Updated `robot` joint positions in the default scene configuration.

- **Launch file updates:**
  - Added handling for MoveIt SRDF file processing, including semantic descriptions.
  - Refactored unused parameters (`gripper_name`, `hardware`) and streamlined arguments.
  - Extended `robot_type` choices in the `generate_launch_description` method.

- **Runtime initialization:**
  - Introduced `object_factory` to handle dynamic object instantiation based on type (`box`, `cylinder`, `mesh`, or `model`).
  - Enhanced `scene_config_loader` to process and instantiate objects using the factory function.
2024-11-22 02:15:09 +03:00
b71a2bdf55 add material properties to terrain and ground models
- Introduced `ambient`, `specular`, and `diffuse` attributes to `TerrainData` class.
- Updated `Ground` class to accept and use material properties for ambient, specular, and diffuse values.
- Modified the SDF generation to dynamically apply the provided material properties.
- Integrated material property support in the `Scene` class for terrain setup.
2024-11-22 02:13:01 +03:00
5747057baf fix: deps version resolving 2024-11-21 00:25:22 +03:00
552a3c6a71 fix: install nlohmann-json via rosdep 2024-11-20 23:12:58 +03:00
a8874fa0d7 Update Dockerfile and dependencies, add installation guide
- Switched base image in `Dockerfile` to `nvidia/cuda:12.6.2-cudnn-devel-ubuntu22.04`.
- Added non-interactive mode for Debian and streamlined package installation.
- Removed unused JSON library build steps.
- Enhanced ROS2 installation with keyring and repository setup.
- Simplified Python package and framework dependencies installation.
- Added commands for `git-lfs` installation and cloning `rbs_assets_library`.
- Introduced a new Russian installation guide (`doc/ru/installation.md`) with detailed steps for setting up the framework and dependencies.
- Fixed import paths in `octree.py` for consistency with project structure.
- Added `all-deps.repos` and `requirements.txt` for managing dependencies.
2024-11-20 21:07:19 +03:00
17401c29a7 add interactive argument to control robot with interactive marker 2024-11-19 00:05:50 +03:00
85eec1b7d7 added doc on how to use framework with your robot or how to add new robot 2024-11-18 13:36:56 +03:00
ea4ae0ed69 feat(rbs): refactor controller paths and launch configuration
- Rename default controllers file `rbs_arm0_controllers.yaml` to `controllers.yaml` across all launch files
- Enhance `runtime.launch.py` by adding imports (`URDF_parser`, `ControllerManager`, `yaml`) and new arguments (`scene_config_file`, `ee_link_name`, `base_link_name`)
  - Implement xacro argument loading via YAML
  - Configure `robot_builder` to save controllers to `controllers.yaml` based on URDF parsing
- Add `control.launch.py` in `rbs_bringup` for dynamic controller spawning based on strategies/configurations
- Add `rbs_bringup.launch.py` as a unified entry point for single robot setup, initializing core settings like gripper, robot type, and controllers
- Remove `launch_env.launch.py`
- Remove `multi_robot.launch.py`
- Enhance `rbs_robot.launch.py` with `ee_link_name` and `base_link_name` arguments for end-effector and base link customization
- Add `ee_link_name` and `base_link_name` to `skills.launch.py` for flexible robot setup in skills
- Update `mtp_jtc_cart.cpp` with `base_link` and `robot_ee_link` parameters for KDL chain retrieval
- Remove `single_robot.launch.py` for simplified single robot deployment
2024-11-12 22:23:12 +03:00
a7b7225dd1 refactor(rbs_skill_servers): update action configuration, dependencies, and skills
- Removed `assembly_config_service.py` node from launch configuration.
- Added default `goal.duration` setting to `MoveToPose` and `MoveToPoseArray`.
- Replaced `timeout_seconds` with `duration` in action definitions for `MoveitSendJointStates` and `MoveitSendPose`.
- Removed dependencies on TinyXML2 and Gazebo/SDFormat, adding `controller_manager_msgs` and `control_msgs` to CMake configuration.
- Added new action servers `cartesian_move_to_pose` and `move_to_joint_states`, registering them in CMakeLists file.
- Introduced `SkillBase`, a template class for managing action-based skills, providing essential ROS 2 action server support and functionalities for handling goals, cancels, accepted actions, and controller management.
- Implemented methods to load, configure, and switch required controllers with conflict detection for active controllers, along with parameter checking and asynchronous handling for required parameters.
- Enhanced error handling for missing controllers, parameters, and resource conflicts.
- Updated `skills.launch.py` to utilize `ComposableNodeContainer` for skill nodes, incorporating `MoveToJointStateActionServer` and `CartesianMoveToPose` as composable nodes.
- Changed the executable name in `cartesian_move_to_pose_action_server` node configuration.
- Added `cartesian_move_to_pose.cpp`, implementing the `CartesianMoveToPose` action server, including trajectory interpolation, pose adjustment, and controller management.
- Updated `package.xml` to include `rclcpp_components` dependency.
- Refactored `MoveToJointStateActionServer` to extend `SkillBase`, leveraging `FollowJointTrajectory` for joint trajectory execution, while removing redundant code and dependencies.
- Implemented trajectory generation based on initial and target joint positions with parameterized interpolation for smoother execution, enhancing joint state handling to dynamically align current and target joint values.
2024-11-06 23:57:47 +03:00
4dccc2b74c update dependencies in package 2024-10-29 10:07:44 +03:00
d6cd0d5601 update move to pose 2024-10-18 18:23:53 +03:00
16ec90cabe delete pe_dope from rbs_perception 2024-10-15 16:19:14 +03:00
b8dad502a1 add rbss_poseestimation 2024-10-15 16:19:14 +03:00
dba3b8682a refactor: (env_manager, rbs_runtime) and add YAML config loading
- Updated `camera.py` to use consistent float literals for default spawn positions.
- Removed unused import statements and organized imports in `robot.py` and `scene.py`.
- Removed debugging import from `scene.py` to clean up codebase.
- Added a new YAML configuration file (`default-scene-config.yaml`) for scene settings.
- Implemented a scene configuration loader function in `rbs_runtime/__init__.py` to read and parse YAML config files.
- Modified `runtime.py` to utilize the newly added scene config loader and removed in-code default scene setup.
- Updated `setup.py` to include `config` directory in package data.
- Changed `rbs_robot.launch.py` to use position control strategy by default.
- Refactored `skills.launch.py` with cleaner parameter definitions and reactivated commented-out nodes.
2024-10-14 14:23:49 +03:00
cc9b525637 fix: restart node instead of writer.close() 2024-10-10 13:20:02 +03:00
95655d1028 rewrite bagfile_recorder from python to cpp 2024-10-10 13:20:02 +03:00
519004f6d2 fix: resolve issue when rbs_bringup loaded without robot_description parameter 2024-10-10 13:20:02 +03:00
a8480b290a fix: delete old env_manager launch in rbs_bringup and rbs_simulation 2024-10-10 13:20:02 +03:00
ec604bccb8 update skills: recording demo, object detection 2024-10-10 13:20:02 +03:00
b42c2e633e feat: enhance scene management and object handling with new features and improvements
- Updated Sphere, Cylinder, Box classes to support random color generation by accepting an optional color parameter and implementing random color assignment if none is provided.
- Improved documentation formatting in the RbsArm class for better readability and consistency.
- Refactored scene management to integrate both Model and Mesh classes, allowing for more flexible object handling. This includes updating object instantiation and adding comments for future color randomization implementation.
- Added `trimesh` as a dependency in the setup configuration to ensure proper functionality for mesh handling.
- Cleaned up node initialization in the runtime launch setup for improved readability.
- Enhanced the default scene configuration by including new ModelData and MeshData objects, with random color generation configured for MeshData.
- Renamed `MeshObjectData` to `ModelData` for clarity and introduced a new `MeshData` class to specifically handle mesh properties.
- Added a `random_color` attribute to `ObjectRandomizerData` and updated `ObjectData` to include a `color` attribute for better object customization.
- Introduced new gripper data classes for better organization and added a `GripperEnum` to categorize different gripper types.
- Implemented a new Mesh class for handling 3D mesh objects in Gazebo simulation, including methods for calculating inertia and generating SDF strings, with error handling for missing mesh files.
2024-10-04 18:44:13 +03:00
31d2afe6e2 docs(env_manager): Update docstrings and refactor code
- Added detailed docstrings to the env_manager package for improved documentation and clarity.
- Refactored code in multiple files to enhance readability and maintainability.
2024-09-30 23:30:04 +03:00
860f7d6566 build: migrate env_manager, rbs_gym, rbs_runtime to ament_python
Migrate `env_manager`, `rbs_gym`, and `rbs_runtime` from ament_cmake to ament_python.
Removed unnecessary files including .json and .yaml config files
2024-09-30 18:34:57 +03:00
e4e3e4e3af add external robot_description parameter for rbs_robot.launch.py
feat(robot): add support for handling scalar joint positions

- Updated `RobotData` and `RbsArm` to allow joint positions to be passed
as either a list or a scalar value.
- Refactored logic to dynamically handle scalar values and repeat them
across all joints.
- Added new `initial_arm_joint_positions` and
`initial_gripper_joint_positions` properties in `RbsArm`.
- Improved joint position initialization in the `Scene` class to
retrieve robot description asynchronously if not provided.
- Enhanced the launch script to configure environment variables based on
available CPU cores.
- Minor code cleanups and bug fixes, including terrain naming and
corrected joint defaultsd.

git commit --amend
2024-09-30 13:41:36 +03:00
bc8745abe5 refactor env_manager and rbs_gym to work with rbs_runtime 2024-09-25 14:59:08 +03:00
6ea2eefc42 united rbs_interface with rbs_bt_executor 2024-09-25 12:14:29 +03:00
910232983c Merge branch 'patch/7617f32' 2024-09-24 13:34:33 +03:00
6ad8e387a3 ADD: Node for recording demo in BT 2024-09-17 08:48:20 +00:00
1a562b05ca rbs_gym multi camera and multi object setup 2024-09-13 22:22:47 +03:00
b4b452297d Cartesian Move_to_pose Skill for BT Interface Node 2024-09-04 08:46:27 +00:00
bf965bb750 Add packages description 2024-08-28 09:52:14 +00:00
2de37b027b Migration to BT.cpp v4 & new BT executor 2024-07-04 12:11:07 +00:00
b58307dea1 Added rbs_gym package for RL & multi-robot launch setup 2024-07-04 11:38:08 +00:00
f92670cd0d Add Object Detection as Interface Node 2024-06-25 08:35:54 +00:00
38401d9eff Merge branch 'main' into fix-simulation-running 2024-05-27 14:21:22 +03:00
49e036af5e BT interface node works with web-service 2024-05-27 08:35:27 +00:00
798160767a fix gazebo world filepath 2024-05-27 00:20:17 +03:00
3745cb4ac6 remove robot_builder code from launch file 2024-05-26 17:48:28 +03:00
1dc1da1d3c delete missing deps rbs_bt_executor 2024-05-26 17:17:42 +03:00