Skip to content

Commit

Permalink
Merge pull request #23 from Fool-Stuck/chore/fix_style_with_precommit
Browse files Browse the repository at this point in the history
chore: fix style with pre-commit
  • Loading branch information
Autumn60 authored Jul 2, 2024
2 parents a116338 + 4e3bcab commit 6213104
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ IncludeCategories:
# Local package headers
- Regex: '".*"'
Priority: 1
CaseSensitive: true
CaseSensitive: true
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Build tests
id: build_test
run: |
. /opt/ros/${{ matrix.rosdistro }}/setup.sh &&
. /opt/ros/${{ matrix.rosdistro }}/setup.sh &&
colcon build
continue-on-error: true

Expand All @@ -52,7 +52,7 @@ jobs:
id: run_test
run: |
. /opt/ros/${{ matrix.rosdistro }}/setup.sh &&
colcon test &&
colcon test &&
colcon test-result
continue-on-error: true

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ log/

# Python
*.pyc

# prettier
node_modules/
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*.param.yaml
*.rviz
*.rviz
2 changes: 1 addition & 1 deletion .yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ rules:
check-keys: false # To allow 'on' of GitHub Actions
quoted-strings:
level: error
required: only-when-needed # To keep consistent style
required: only-when-needed # To keep consistent style
14 changes: 14 additions & 0 deletions CPPLINT.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
set noparent
linelength=100
includeorder=standardcfirst
filter=-build/c++11
filter=-build/namespaces_literals
filter=-runtime/references
filter=-whitespace/braces
filter=-whitespace/indent
filter=-whitespace/parens
filter=-whitespace/semicolon
filter=-build/header_guard
filter=-build/include_order
filter=-build/include_subdir
filter=-legal/copyright
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,37 @@ Fool Stuck Robot
## 1. Setup

1. Update pkg list

```bash
sudo apt update
```

2. Install VCS tool

```bash
sudo apt install -y python3-vcstool
```

3. Clone repos

```bash
git clone https://github.com/Fool-Stuck/wheel-stuck-ros-pkgs.git
```

4. Import depend pkgs(source)

```bash
vcs import src < depend_packages.repos --recursive
```

5. Install depend pkgs(binary)

```bash
rosdep install -i -y --from-paths src --ignore-src
```

6. Build

```bash
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release
```
Expand Down
2 changes: 1 addition & 1 deletion depend_packages.repos
Original file line number Diff line number Diff line change
@@ -1 +1 @@
repositories:
repositories:
2 changes: 1 addition & 1 deletion src/common/wheel_stuck_utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ if(BUILD_TESTING)
ament_lint_auto_find_test_dependencies()
endif()

ament_auto_package()
ament_auto_package()
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

#include <rclcpp/rclcpp.hpp>

#include <memory>
#include <string>

namespace wheel_stuck_utils::ros
{

Expand Down Expand Up @@ -43,6 +46,6 @@ class NoCallbackSubscription
}
};

} // namespace wheel_stuck_utils
} // namespace wheel_stuck_utils::ros

#endif
#endif // WHEEL_STUCK_UTILS__ROS__NO_CALLBACK_SUBSCRIPTION_HPP_
2 changes: 1 addition & 1 deletion src/common/wheel_stuck_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
<export>
<build_type>ament_cmake</build_type>
</export>
</package>
</package>
2 changes: 1 addition & 1 deletion src/planning/dwa_planner/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ endif()
ament_auto_package(INSTALL_TO_SHARE
config
launch
)
)
28 changes: 13 additions & 15 deletions src/planning/dwa_planner/launch/dwa_planner.launch.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
<launch>
<arg name="local_costmap_topic" default="/perception/costmap" />
<arg name="odom_topic" default="/localization/odom" />
<arg name="local_goal_topic" default="/planning/local_goal" />
<arg name="cmd_vel_topic" default="/planning/cmd_vel" />
<arg name="local_costmap_topic" default="/perception/costmap"/>
<arg name="odom_topic" default="/localization/odom"/>
<arg name="local_goal_topic" default="/planning/local_goal"/>
<arg name="cmd_vel_topic" default="/planning/cmd_vel"/>

<arg name="config_file"
default="$(find-pkg-share dwa_planner)/config/dwa_planner.param.yaml" />
<arg name="config_file" default="$(find-pkg-share dwa_planner)/config/dwa_planner.param.yaml"/>

<node pkg="dwa_planner" name="dwa_planner" exec="dwa_planner_node"
output="screen">
<remap from="~/input/local_costmap" to="$(var local_costmap_topic)" />
<remap from="~/input/odom" to="$(var odom_topic)" />
<remap from="~/input/local_goal" to="$(var local_goal_topic)" />
<remap from="~/output/cmd_vel" to="$(var cmd_vel_topic)" />
<param from="$(var config_file)" />
</node>
</launch>
<node pkg="dwa_planner" name="dwa_planner" exec="dwa_planner_node" output="screen">
<remap from="~/input/local_costmap" to="$(var local_costmap_topic)"/>
<remap from="~/input/odom" to="$(var odom_topic)"/>
<remap from="~/input/local_goal" to="$(var local_goal_topic)"/>
<remap from="~/output/cmd_vel" to="$(var cmd_vel_topic)"/>
<param from="$(var config_file)"/>
</node>
</launch>
2 changes: 1 addition & 1 deletion src/planning/dwa_planner/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<export>
<build_type>ament_cmake</build_type>
</export>
</package>
</package>

0 comments on commit 6213104

Please sign in to comment.