Skip to content

Commit

Permalink
Merge branch 'ros2-devel' into ros2-add-docker
Browse files Browse the repository at this point in the history
  • Loading branch information
rafal-gorecki committed Dec 20, 2024
2 parents f1d45b4 + 644e008 commit e673e44
Show file tree
Hide file tree
Showing 81 changed files with 705 additions and 735 deletions.
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
# mesh files has to be taken into account
Expand Down Expand Up @@ -34,7 +34,7 @@ repos:
- id: cmake-format

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.8
rev: v19.1.3
hooks:
- id: clang-format

Expand Down Expand Up @@ -63,7 +63,7 @@ repos:
args: [--mapping, '2', --sequence, '4', --offset, '2', --width, '100']

- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
args: ["--line-length=99"]
Expand All @@ -87,11 +87,11 @@ repos:

# Docs - RestructuredText hooks
- repo: https://github.com/PyCQA/doc8
rev: v1.1.1
rev: v1.1.2
hooks:
- id: doc8
args: ["--max-line-length=100", "--ignore=D001"]
exclude: ^.*\/CHANGELOG\.rst/.*$
exclude: ^.*\/CHANGELOG\.rst$

- repo: https://github.com/tier4/pre-commit-hooks-ros
rev: v0.10.0
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Launch arguments are largely common to both simulation and physical robot. Howev
||| `add_world_transform` | Adds a world frame that connects the tf trees of individual robots (useful when running multiple robots). <br/> ***bool:*** `False` |
||| `animations_config_path` | Path to a YAML file with a description of led configuration. This file includes definition of robot panels, virtual segments and default animations. <br/> ***string:*** [`{robot_model}_animations.yaml`](./husarion_ugv_lights/config) |
||| `battery_config_path` | Path to the Ignition LinearBatteryPlugin configuration file. This configuration is intended for use in simulations only. <br/> ***string:*** `None` |
||| `components_config_path` | Additional components configuration file. Components described in this file are dynamically included in robot's URDF. Available options are described in [the manual](https://husarion.com/manuals/panther/panther-options). <br/> ***string:*** [`components.yaml`](./panther_description/config/components.yaml) |
||| `components_config_path` | Additional components configuration file. Components described in this file are dynamically included in robot's URDF. Available options are described in [the manual](https://husarion.com/manuals/panther/panther-options). <br/> ***string:*** [`components.yaml`](./husarion_ugv_description/config/components.yaml) |
||| `controller_config_path` | Path to controller configuration file. A path to custom configuration can be specified here. <br/> ***string:*** [`{wheel_type}_controller.yaml`](./husarion_ugv_controller/config/) |
||| `disable_manager` | Enable or disable manager_bt_node. <br/> ***bool:*** `False` |
||| `fuse_gps` | Include GPS for data fusion. <br/> ***bool:*** `False` |
Expand All @@ -111,11 +111,11 @@ Launch arguments are largely common to both simulation and physical robot. Howev
||| `use_rviz` | Run RViz simultaneously. <br/> ***bool:*** `True` |
||| `use_sim` | Whether simulation is used. <br/> ***bool:*** `False` |
||| `user_led_animations_path` | Path to a YAML file with a description of the user-defined animations. <br/> ***string:*** `''` |
||| `wheel_config_path` | Path to wheel configuration file. <br/> ***string:*** [`{wheel_type}.yaml`](./panther_description/config) |
||| `wheel_config_path` | Path to wheel configuration file. <br/> ***string:*** [`{wheel_type}.yaml`](./husarion_ugv_description/config) |
||| `wheel_type` | Specify the wheel type. If the selected wheel type is not 'custom', the wheel_config_path and controller_config_path arguments will be automatically adjusted and can be omitted. <br/> ***string:*** `WH01` (for Panther), `WH05` (for Lynx) (choices: `WH01`, `WH02`, `WH04`, `WH05`, `custom`) |
||| `x` | Initial robot position in the global 'x' axis. <br/> ***float:*** `0.0` |
||| `y` | Initial robot position in the global 'y' axis. <br/> ***float:***` -2.0` |
||| `z` | Initial robot position in the global 'z' axis. <br/> ***float:*** `0.0` |
||| `z` | Initial robot position in the global 'z' axis. <br/> ***float:*** `0.2` |
||| `roll` | Initial robot 'roll' orientation. <br/> ***float:*** `0.0` |
||| `pitch` | Initial robot 'pitch' orientation. <br/> ***float:*** `0.0` |
||| `yaw` | Initial robot 'yaw' orientation. <br/> ***float:*** `0.0` |
Expand Down
Loading

0 comments on commit e673e44

Please sign in to comment.