Skip to content

Commit

Permalink
Fix formatting. (#212)
Browse files Browse the repository at this point in the history
  • Loading branch information
destogl authored May 16, 2024
1 parent b3a80bc commit aac91e6
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 16 deletions.
Empty file removed .codespell-ignore-words.txt
Empty file.
1 change: 1 addition & 0 deletions .codespell-ignore-words.txt
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Its main goal is to optimize the workflow of development teams and focus more on

This package targets the following stakeholders:

* **Robotic Companies** to have a unified, overview repository of their use-cases, enable across-teams re-use of ROS packages, and to define "standardized" development structure.
* **Robotic Companies** to have a unified, overview repository of their use-cases, enable across-teams reuse of ROS packages, and to define "standardized" development structure.
* **Robotic Consultants** to simplify ROS packages' management and provide open and documented package-structure for their customers.
* **R&D Departments** to propagate the packages across their development stages by keeping simple access and sharing policy.
* **Research Labs** to organize their work across research groups and reduce onboarding time for new students.
Expand Down
2 changes: 1 addition & 1 deletion docs/docker/nvidia_docker/setup_nvidia_support.rst
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ If you get any error follow the next steps to be sure that the expected version
4. If you have issues with the graphics after restart do the following:

1. Close your eyes and breathe slowely in and out at least once :)
2. You probably didn't install everything properly so the open-source ``noveau`` driver is used which is not adequate for this scenario.
2. You probably didn't install everything properly so the open-source ``nouveau`` driver is used which is not adequate for this scenario.
3. Use ``<CTRL> + <ALT> + <F2-3-4...>`` keys to switch to a linux terminal.
4. Login there and execute ``ubuntu-drivers`` command to install missing drivers.
5. Now restart again and everything should work properly.
Expand Down
2 changes: 1 addition & 1 deletion docs/guidelines/robot_package_structure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ROS-Robot Package structure

This document proposes guidelines for the structure of ROS packages in larger details than provided by `ROS Enhancement Proposals (REPs) <https://github.com/ros-infrastructure/rep>`_

**NOTE**: All the proposal here are the resuls of authors' personal experiences. Saying that, if you don't like some of it, you are free to change what you want and need (and hopefully propose it as PR).
**NOTE**: All the proposal here are the results of authors' personal experiences. Saying that, if you don't like some of it, you are free to change what you want and need (and hopefully propose it as PR).

Package structure for Robot support in ROS
------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Purpose of the *RosTeamWS*

This package targets the following stakeholders:

* **Robotic Companies** to have a unified, overview repository of their use-cases, enable across-teams re-use of ROS packages, and to define "standardized" development structure.
* **Robotic Companies** to have a unified, overview repository of their use-cases, enable across-teams reuse of ROS packages, and to define "standardized" development structure.
* **Robotic Consultants** to simplify ROS packages' management and provide open and documented package-structure for their customers.
* **R&D Departments** to propagate the packages across their development stages by keeping simple access and sharing policy.
* **Research Labs** to organize their work across research groups and reduce onboarding time for new students.
Expand Down
2 changes: 1 addition & 1 deletion rtwcli/rtw_cmds/rtw_cmds/workspace/verbs.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def env_var_to_workspace_var(env_var: str, env_var_value: str) -> str:

def workspace_var_to_env_var(ws_var: str, ws_var_value: Any) -> str:
env_var = ROS_TEAM_WS_PREFIX + ws_var.upper()
if type(ws_var_value) == bool:
if type(ws_var_value) is bool:
env_var_value = str(ws_var_value).lower()
else:
env_var_value = ws_var_value
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/_RosTeamWs_Docker_Defines.bash
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
docker_script_own_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
source $docker_script_own_dir/../_RosTeamWs_Defines.bash

# assoziative array which maps the chosen rosdistro to the name which is used to install the corresponding
# associative array which maps the chosen rosdistro to the name which is used to install the corresponding
# ros distribution inside docker
declare -r -A map_to_docker_ros_distro_name=( ["noetic"]="noetic" ["foxy"]="foxy" ["galactic"]="galactic" ["rolling"]="rolling" ["humble"]="humble" ["iron"]="iron")
declare -r -A ros_distro_to_rtw_branch=( ["noetic"]="master" ["foxy"]="foxy" ["galactic"]="master" ["rolling"]="master" ["humble"]="master" ["iron"]="master")
Expand Down
2 changes: 1 addition & 1 deletion templates/package/_append_to_README_code_formatting.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ pre-commit run -a

**NOTE**: make sure that you have sources your ROS workspace before running `pre-commit` because it uses some office ROS 2 `ament_*` formatters.

Sometimes there might a need to avoid formatting of a certain commit. If so add `-n` flag to your `git commit` command to skip the `pre-commit` chekcs.
Sometimes there might a need to avoid formatting of a certain commit. If so add `-n` flag to your `git commit` command to skip the `pre-commit` checks.
4 changes: 2 additions & 2 deletions templates/ros2_control/append_to_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Consult the repository and [ros2_control documentation](https://ros-controls.git

## Loading Controllers

To move the robot you should load and start contorllers.
To move the robot you should load and start controllers.
To get feedback about robot's state `JointStateController` is used.
to send command to the robot `ForwardCommandController` (direct goals) or `JointTrajectoryController` (interpolates trajectory).
The sections below describe their usage.
Expand Down Expand Up @@ -161,7 +161,7 @@ Now you should also see your robot represented correctly in the `rviz2`.
ros2 launch ros2_control_demo_robot test_joint_trajectory_controller.launch.py
```

**NOTE**: You can switch contorllers (step 1 and 2) also with one command:
**NOTE**: You can switch controllers (step 1 and 2) also with one command:
```
ros2 control switch_controllers --stop-controllers forward_<controller_type>_controller --start-controllers joint_trajectory_controller
```
Expand Down
2 changes: 1 addition & 1 deletion templates/ros2_control/controller/dummy_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ controller_interface::CallbackReturn DummyClassName::on_activate(
const rclcpp_lifecycle::State & /*previous_state*/)
{
// TODO(anyone): if you have to manage multiple interfaces that need to be sorted check
// `on_activate` method in `JointTrajectoryController` for examplary use of
// `on_activate` method in `JointTrajectoryController` for exemplary use of
// `controller_interface::get_ordered_interfaces` helper function

// Set default value in command
Expand Down
16 changes: 10 additions & 6 deletions templates/ros2_control/robot_ros2_control.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,11 @@ def generate_launch_description():
delay_robot_controller_spawners_after_joint_state_broadcaster_spawner += [
RegisterEventHandler(
event_handler=OnProcessExit(
target_action=robot_controller_spawners[i - 1]
if i > 0
else joint_state_broadcaster_spawner,
target_action=(
robot_controller_spawners[i - 1]
if i > 0
else joint_state_broadcaster_spawner
),
on_exit=[controller],
)
)
Expand All @@ -214,9 +216,11 @@ def generate_launch_description():
delay_inactive_robot_controller_spawners_after_joint_state_broadcaster_spawner += [
RegisterEventHandler(
event_handler=OnProcessExit(
target_action=inactive_robot_controller_spawners[i - 1]
if i > 0
else robot_controller_spawners[-1],
target_action=(
inactive_robot_controller_spawners[i - 1]
if i > 0
else robot_controller_spawners[-1]
),
on_exit=[controller],
)
)
Expand Down

0 comments on commit aac91e6

Please sign in to comment.