Skip to content

Commit 93d8069

Browse files
Merge pull request #3 from CNR-STIIMA-IRAS/refactor
Refactor
2 parents 7c99b0c + 2b8f96b commit 93d8069

130 files changed

Lines changed: 15161 additions & 2356 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# DRIMS2 Motion Control
1+
# Easy Motion
22

3-
This repository is part of the **DRIMS2 Summer School** and provides a motion control stack based on ROS 2 and MoveIt. It includes behavior tree integration, motion command interfaces, and an action server for handling motion requests.
3+
This repository is initially developed for **DRIMS2 Summer School** as a simplified interface for planinng and control, and provides a motion control stack based on ROS 2 and MoveIt (through Pymoveit2). It includes behavior tree integration, motion command interfaces, and an action server for handling motion requests.
44

55
## Repository Structure
66

77
This repository contains the following ROS 2 packages:
88

9-
- **`drims2_msgs`**
9+
- **`easy_motion_msgs`**
1010
Contains the ROS 2 interface definitions for motion commands. Key interfaces include:
1111
- Actions:
1212
- `MoveToPose`
@@ -17,15 +17,15 @@ This repository contains the following ROS 2 packages:
1717
- `DiceIdentification`
1818

1919

20-
- **`drims2_motion_server`**
20+
- **`easy_motion`**
2121
Implements the motion **action/service server** that:
2222
- Receives `MoveToPose` and `MoveToJoint` requests.
2323
- Handles `AttachObject` and `DetachObject` service calls.
2424
- Interfaces with **MoveIt** to plan and execute robot motions.
2525

26-
🔗 [Documentation](https://cnr-stiima-iras.github.io/drims2_motion_control/index.html)
26+
🔗 [Documentation](https://cnr-stiima-iras.github.io/easy_motion/index.html)
2727

28-
- **`drims2_behavior_tree`**
28+
- **`easy_motion_behavior_tree`**
2929
Integrates a **Behavior Tree engine** to control task execution. This package contains:
3030
- Custom **leaf nodes** for motion commands.
3131
- Logic for behavior tree loading and execution.
@@ -35,8 +35,8 @@ This repository contains the following ROS 2 packages:
3535
### Clone the Repository
3636

3737
```bash
38-
mkdir -p ~/projects/drims2_ws/src
39-
cd ~/projects/drims2_ws/src
40-
git clone https://github.com/CNR-STIIMA-IRAS/drims2_motion_control.git
41-
vcs import < drims2_motion_control/dependencies.repos
38+
mkdir -p ~/projects/easy_ws/src
39+
cd ~/projects/easy_ws/src
40+
git clone https://github.com/CNR-STIIMA-IRAS/easy_motion.git
41+
vcs import < easy_motion/dependencies.repos
4242
```

docs/__readme_include.html

Lines changed: 58 additions & 70 deletions
Large diffs are not rendered by default.

docs/_sources/drims2_motion_server.drims2_utils.rst.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/_sources/drims2_motion_server.motion_client.rst.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/_sources/drims2_motion_server.motion_server.rst.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/_sources/drims2_motion_server.rst.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
easy\_motion.easy\_motion\_utils module
2+
=======================================
3+
4+
.. automodule:: easy_motion.easy_motion_utils
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
easy\_motion.motion\_client module
2+
==================================
3+
4+
.. automodule:: easy_motion.motion_client
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
easy\_motion.motion\_server module
2+
==================================
3+
4+
.. automodule:: easy_motion.motion_server
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

docs/_sources/easy_motion.rst.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
easy\_motion package
2+
====================
3+
4+
Submodules
5+
----------
6+
7+
.. toctree::
8+
:maxdepth: 4
9+
10+
easy_motion.easy_motion_utils
11+
easy_motion.motion_client
12+
easy_motion.motion_server
13+
14+
Module contents
15+
---------------
16+
17+
.. automodule:: easy_motion
18+
:members:
19+
:undoc-members:
20+
:show-inheritance:

0 commit comments

Comments
 (0)