Skip to content

Commit ffa4b6f

Browse files
312 organize and clean up existing code (#329)
* Remove unused files Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Missing docs, but new working configuration management implementation of the launching of the platforms Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Update docstrings, still need to rename certain functions Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Add empty files in preparation for splitting up the robot.py file Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Split robot.py into separate files and extract global methods and variables from the Platform class and place them in different files Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Change name of file that describes its use better Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Make global methods in platform.py specific to the Platform class since they are only used there, and remove the old robot.py file Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Adjusted the code to pass the linting checks Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Move class-specific functions to the corresponding classes Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Generalise 'robot' to 'platform' where possible Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Fix naming in URDFs Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Rename package rcdt_messages to rcdt_interfaces to follow the classic ros2 naming standards more closely Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Minor updates for the code after Jelmer's review Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Move configuration context to EnvironmentConfig since that's accessible from everywhere, and change robots.launch.py to bringup.launch.py to follow ros2 naming standards more closely Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Rename '.platform' to '.platform_type' to make the code easier to read Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Update linting Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Remove unused images from repo Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Rename 'utils_conf' to 'utils_config' Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Improve naming Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Rename configuration files and add predefined configuration class Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Update rcdt_test file structure Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> * Move 'SKIP' to launch_utils and work through all remaining TODOs Signed-off-by: Rosalie <rosalie.van.ark@alliander.com> --------- Signed-off-by: Rosalie <rosalie.van.ark@alliander.com>
1 parent c88352c commit ffa4b6f

138 files changed

Lines changed: 2158 additions & 4106 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.

conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import rclpy
1111
from _pytest.config import Config
1212
from _pytest.config.argparsing import Parser
13-
from rcdt_launch.robot import Platform
13+
from rcdt_utilities.launch_utils import reset
1414
from rclpy.node import Node
1515

1616

@@ -26,7 +26,7 @@ def pytest_addoption(parser: Parser) -> None:
2626
@pytest.fixture(scope="module", autouse=True)
2727
def reset_platform() -> None:
2828
"""Fixture to automatically reset the platform configuration from a previous test module."""
29-
Platform.reset()
29+
reset()
3030

3131

3232
@pytest.fixture(scope="module")

dockerfiles/install_scripts/pyflow.sh

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

dockerfiles/install_scripts/rosboard.sh

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

docs/content/conventions/conventions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ The file ends with the default test dependency and an export definition.
114114

115115
### Custom messages, services and actions
116116

117-
We define custom messages, services and actions in our *rcdt_messages* package. This package has the following folder structure:
117+
We define custom messages, services and actions in our *rcdt_interfaces* package. This package has the following folder structure:
118118

119119
```text
120120
ros_package/

docs/content/getting_started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ From now on, when you open a new terminal, this alias is available and you can s
9797
You can now launch our system using:
9898

9999
```bash
100-
ros2 launch rcdt_launch robots.launch.py
100+
ros2 launch rcdt_launch bringup.launch.py
101101
```
102102

103103
Note that the system won't start if no configuration is provided. The possible launch arguments can be acquired by adding the `-s` flag. More information about launching the system and selecting a configuration can be found on the [](system) page.

docs/img/realsense/correct.png

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

docs/img/realsense/correct.png.license

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

docs/img/realsense/frame.png

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

docs/img/realsense/frame.png.license

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

docs/img/realsense/optical_frame.png

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

0 commit comments

Comments
 (0)