From 908ab43d63702e90500726deb601685908bdb8a3 Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Tue, 2 Jul 2024 23:00:21 +0900 Subject: [PATCH 1/8] add newline at eof of package.xml Signed-off-by: Autumn60 --- src/planning/dwa_planner/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/planning/dwa_planner/package.xml b/src/planning/dwa_planner/package.xml index 93aef8a..e41b8f5 100644 --- a/src/planning/dwa_planner/package.xml +++ b/src/planning/dwa_planner/package.xml @@ -20,4 +20,4 @@ ament_cmake - \ No newline at end of file + From ecfb7ec95972105706df18521bb720122dc7db0a Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Tue, 2 Jul 2024 23:05:06 +0900 Subject: [PATCH 2/8] add newline at eof Signed-off-by: Autumn60 --- src/common/wheel_stuck_utils/CMakeLists.txt | 2 +- .../include/wheel_stuck_utils/ros/no_callback_subscription.hpp | 2 +- src/common/wheel_stuck_utils/package.xml | 2 +- src/planning/dwa_planner/CMakeLists.txt | 2 +- src/planning/dwa_planner/launch/dwa_planner.launch.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/wheel_stuck_utils/CMakeLists.txt b/src/common/wheel_stuck_utils/CMakeLists.txt index 592a5af..d3b04a0 100644 --- a/src/common/wheel_stuck_utils/CMakeLists.txt +++ b/src/common/wheel_stuck_utils/CMakeLists.txt @@ -19,4 +19,4 @@ if(BUILD_TESTING) ament_lint_auto_find_test_dependencies() endif() -ament_auto_package() \ No newline at end of file +ament_auto_package() diff --git a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp b/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp index 88bb225..5f058d9 100644 --- a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp +++ b/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp @@ -45,4 +45,4 @@ class NoCallbackSubscription } // namespace wheel_stuck_utils -#endif \ No newline at end of file +#endif diff --git a/src/common/wheel_stuck_utils/package.xml b/src/common/wheel_stuck_utils/package.xml index 09976be..2d0dd66 100644 --- a/src/common/wheel_stuck_utils/package.xml +++ b/src/common/wheel_stuck_utils/package.xml @@ -17,4 +17,4 @@ ament_cmake - \ No newline at end of file + diff --git a/src/planning/dwa_planner/CMakeLists.txt b/src/planning/dwa_planner/CMakeLists.txt index 1cb7532..b2056ad 100644 --- a/src/planning/dwa_planner/CMakeLists.txt +++ b/src/planning/dwa_planner/CMakeLists.txt @@ -31,4 +31,4 @@ endif() ament_auto_package(INSTALL_TO_SHARE config launch -) \ No newline at end of file +) diff --git a/src/planning/dwa_planner/launch/dwa_planner.launch.xml b/src/planning/dwa_planner/launch/dwa_planner.launch.xml index 41a1c1f..3ebd0b7 100644 --- a/src/planning/dwa_planner/launch/dwa_planner.launch.xml +++ b/src/planning/dwa_planner/launch/dwa_planner.launch.xml @@ -15,4 +15,4 @@ - \ No newline at end of file + From fc4213c58fe8d00cbca99273fd2d0c2ddca5af8c Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Tue, 2 Jul 2024 23:11:34 +0900 Subject: [PATCH 3/8] fix tab size in dwa_planner.launch.xml Signed-off-by: Autumn60 --- .../dwa_planner/launch/dwa_planner.launch.xml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/planning/dwa_planner/launch/dwa_planner.launch.xml b/src/planning/dwa_planner/launch/dwa_planner.launch.xml index 3ebd0b7..48586cf 100644 --- a/src/planning/dwa_planner/launch/dwa_planner.launch.xml +++ b/src/planning/dwa_planner/launch/dwa_planner.launch.xml @@ -1,18 +1,18 @@ - - - - + + + + - + - - - - - - - - + + + + + + + + \ No newline at end of file From 3c4d14d08ed5ae78ae14d6469cd9b3c801f09643 Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Tue, 2 Jul 2024 23:19:31 +0900 Subject: [PATCH 4/8] fix format dwa_planner.launch.xml Signed-off-by: Autumn60 --- .../dwa_planner/launch/dwa_planner.launch.xml | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/planning/dwa_planner/launch/dwa_planner.launch.xml b/src/planning/dwa_planner/launch/dwa_planner.launch.xml index 48586cf..7b55412 100644 --- a/src/planning/dwa_planner/launch/dwa_planner.launch.xml +++ b/src/planning/dwa_planner/launch/dwa_planner.launch.xml @@ -1,18 +1,16 @@ - - - - + + + + - + - - - - - - + + + + + + - \ No newline at end of file + From 68e627898349f2956468ac3130f1116b156a7a4e Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Tue, 2 Jul 2024 23:32:32 +0900 Subject: [PATCH 5/8] format no_callback_subscription.hpp Signed-off-by: Autumn60 --- CPPLINT.cfg | 14 ++++++++++++++ .../ros/no_callback_subscription.hpp | 7 +++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 CPPLINT.cfg diff --git a/CPPLINT.cfg b/CPPLINT.cfg new file mode 100644 index 0000000..6caddd6 --- /dev/null +++ b/CPPLINT.cfg @@ -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 diff --git a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp b/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp index 5f058d9..19e0c43 100644 --- a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp +++ b/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp @@ -3,6 +3,9 @@ #include +#include +#include + namespace wheel_stuck_utils::ros { @@ -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_ From 331a24ccb28369475765349b8c92033ed140bde3 Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Tue, 2 Jul 2024 23:33:26 +0900 Subject: [PATCH 6/8] chore: ignore node_modules/ in .gitignore Signed-off-by: Autumn60 --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index c2cb7e1..8825bae 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ log/ # Python *.pyc + +# prettier +node_modules/ From d161f09948a89c7b6d0fa4336c3466000d08b957 Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Tue, 2 Jul 2024 23:38:54 +0900 Subject: [PATCH 7/8] add newline at eof Signed-off-by: Autumn60 --- .clang-format | 2 +- .github/workflows/build-and-test.yaml | 4 ++-- .prettierignore | 2 +- .yamllint.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.clang-format b/.clang-format index 7f47408..b41fae9 100644 --- a/.clang-format +++ b/.clang-format @@ -44,4 +44,4 @@ IncludeCategories: # Local package headers - Regex: '".*"' Priority: 1 - CaseSensitive: true \ No newline at end of file + CaseSensitive: true diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 1b90510..a144791 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -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 @@ -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 diff --git a/.prettierignore b/.prettierignore index 8c7368e..a3c34d0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,2 @@ *.param.yaml -*.rviz \ No newline at end of file +*.rviz diff --git a/.yamllint.yaml b/.yamllint.yaml index 87688fb..2c7bd08 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -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 \ No newline at end of file + required: only-when-needed # To keep consistent style From 4e3bcabe9c9dfe2f6255f10170115c46d3d069f9 Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Tue, 2 Jul 2024 23:39:59 +0900 Subject: [PATCH 8/8] format .repos and README.md Signed-off-by: Autumn60 --- README.md | 11 +++++++++++ depend_packages.repos | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index df6abd8..60db613 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/depend_packages.repos b/depend_packages.repos index c22e013..56f46b6 100644 --- a/depend_packages.repos +++ b/depend_packages.repos @@ -1 +1 @@ -repositories: \ No newline at end of file +repositories: