Merge pull request #32 from tier4/sync-upstream

chore: sync upstream
tier4 · Apr 6, 2022 · 0c2022a · 0c2022a
2 parents 4c1d0cb + f037c18
commit 0c2022a
Show file tree

Hide file tree

Showing 24 changed files with 30 additions and 40 deletions.
diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Upload coverage to CodeCov
         if: ${{ steps.test.outputs.coverage-report-files != '' }}
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           files: ${{ steps.test.outputs.coverage-report-files }}
           fail_ci_if_error: false

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Upload coverage to CodeCov
         if: ${{ steps.test.outputs.coverage-report-files != '' }}
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           files: ${{ steps.test.outputs.coverage-report-files }}
           fail_ci_if_error: false

diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -1,7 +1,9 @@
+# See https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md for all rules.
 default: true
 MD013: false
 MD024:
   siblings_only: true
 MD033: false
 MD041: false
 MD046: false
+MD049: false
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -1,2 +1,20 @@
 printWidth: 100
 tabWidth: 2
+overrides:
+  - files: package.xml
+    options:
+      printWidth: 1000
+      xmlSelfClosingSpace: false
+      xmlWhitespaceSensitivity: ignore
+
+  - files: "*.launch.xml"
+    options:
+      printWidth: 200
+      xmlSelfClosingSpace: false
+      xmlWhitespaceSensitivity: ignore
+
+  - files: "*.xacro"
+    options:
+      printWidth: 200
+      xmlSelfClosingSpace: false
+      xmlWhitespaceSensitivity: ignore
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
@@ -11,3 +11,4 @@ filter=-whitespace/parens         # we allow closing parenthesis to be on the ne
 filter=-whitespace/semicolon      # we allow the developer to decide about whitespace after a semicolon
 filter=-build/header_guard        # we automatically fix the names of header guards using pre-commit
 filter=-build/include_order       # we use the custom include order
+filter=-build/include_subdir      # we allow the style of "foo.hpp"
diff --git a/common/goal_distance_calculator/package.xml b/common/goal_distance_calculator/package.xml
@@ -3,7 +3,7 @@
 <package format="3">
   <name>goal_distance_calculator</name>
   <version>0.0.0</version>
-  <description>The goal_distance_calculator package </description>
+  <description>The goal_distance_calculator package</description>
   <maintainer email="ttatcoder@outlook.jp">Taiki Tanaka</maintainer>
   <license>Apache License 2.0</license>
 

diff --git a/common/path_distance_calculator/package.xml b/common/path_distance_calculator/package.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-
   <name>path_distance_calculator</name>
   <version>0.0.0</version>
   <description>The path_distance_calculator package</description>
@@ -20,5 +19,4 @@
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-
 </package>
diff --git a/common/polar_grid/package.xml b/common/polar_grid/package.xml
@@ -24,5 +24,4 @@
     <build_type>ament_cmake</build_type>
     <rviz plugin="${prefix}/plugins/plugin_description.xml"/>
   </export>
-
 </package>
diff --git a/common/tier4_api_utils/package.xml b/common/tier4_api_utils/package.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-
   <name>tier4_api_utils</name>
   <version>0.0.0</version>
   <description>The tier4_api_utils package</description>
@@ -24,5 +23,4 @@
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-
 </package>
diff --git a/common/tier4_datetime_rviz_plugin/package.xml b/common/tier4_datetime_rviz_plugin/package.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <package format="2">
-
   <name>tier4_datetime_rviz_plugin</name>
   <version>0.0.0</version>
   <description>The tier4_datetime_rviz_plugin package</description>
@@ -22,5 +21,4 @@
     <build_type>ament_cmake</build_type>
     <rviz plugin="${prefix}/plugins/plugin_description.xml"/>
   </export>
-
 </package>
diff --git a/common/tier4_localization_rviz_plugin/package.xml b/common/tier4_localization_rviz_plugin/package.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <package format="3">
-
   <name>tier4_localization_rviz_plugin</name>
   <version>0.1.0</version>
   <description>The tier4_localization_rviz_plugin package</description>
@@ -25,5 +24,4 @@
     <build_type>ament_cmake</build_type>
     <rviz plugin="${prefix}/plugins/plugin_description.xml"/>
   </export>
-
 </package>
diff --git a/common/tier4_planning_rviz_plugin/package.xml b/common/tier4_planning_rviz_plugin/package.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <package format="3">
-
   <name>tier4_planning_rviz_plugin</name>
   <version>0.1.0</version>
   <description>The tier4_planning_rviz_plugin package</description>
@@ -28,5 +27,4 @@
     <build_type>ament_cmake</build_type>
     <rviz plugin="${prefix}/plugins/plugin_description.xml"/>
   </export>
-
 </package>
diff --git a/common/tier4_simulated_clock_rviz_plugin/package.xml b/common/tier4_simulated_clock_rviz_plugin/package.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <package format="2">
-
   <name>tier4_simulated_clock_rviz_plugin</name>
   <version>0.0.1</version>
   <description>Rviz plugin to publish and control the /clock topic</description>
@@ -23,5 +22,4 @@
     <build_type>ament_cmake</build_type>
     <rviz plugin="${prefix}/plugins/plugin_description.xml"/>
   </export>
-
 </package>
diff --git a/common/tier4_state_rviz_plugin/package.xml b/common/tier4_state_rviz_plugin/package.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <package format="2">
-
   <name>tier4_state_rviz_plugin</name>
   <version>0.0.0</version>
   <description>The autoware state rviz plugin package</description>
@@ -26,5 +25,4 @@
     <build_type>ament_cmake</build_type>
     <rviz plugin="${prefix}/plugins/plugin_description.xml"/>
   </export>
-
 </package>
diff --git a/control/shift_decider/package.xml b/control/shift_decider/package.xml
@@ -21,5 +21,4 @@
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-
 </package>
diff --git a/launch/tier4_vehicle_launch/package.xml b/launch/tier4_vehicle_launch/package.xml
@@ -7,7 +7,6 @@
   <maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
   <license>Apache License 2.0</license>
 
-
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <exec_depend>robot_state_publisher</exec_depend>

diff --git a/localization/ekf_localizer/package.xml b/localization/ekf_localizer/package.xml
@@ -29,5 +29,4 @@
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-
 </package>
diff --git a/map/util/lanelet2_map_preprocessor/package.xml b/map/util/lanelet2_map_preprocessor/package.xml
@@ -9,25 +9,21 @@
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
   <maintainer email="mitsudome-r@todo.todo">mitsudome-r</maintainer>
 
-
   <!-- One license tag required, multiple allowed, one license per tag -->
   <!-- Commonly used license strings: -->
   <!--   BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
   <license>Apache License 2.0</license>
 
-
   <!-- Url tags are optional, but multiple are allowed, one per tag -->
   <!-- Optional attribute type can be: website, bugtracker, or repository -->
   <!-- Example: -->
   <!-- <url type="website">http://wiki.ros.org/lanelet2_map_preprocessor</url> -->
 
-
   <!-- Author tags are optional, multiple are allowed, one per tag -->
   <!-- Authors do not have to be maintainers, but could be -->
   <!-- Example: -->
   <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
 
-
   <!-- The *depend tags are used to specify dependencies -->
   <!-- Dependencies can be catkin packages or system dependencies -->
   <!-- Examples: -->
@@ -59,10 +55,8 @@
   <exec_depend>pcl_ros</exec_depend>
   <exec_depend>roscpp</exec_depend>
 
-
   <!-- The export tag contains other, unspecified, tags -->
   <export>
     <!-- Other tools can request additional information be placed here -->
-
   </export>
 </package>
diff --git a/perception/tensorrt_yolo/package.xml b/perception/tensorrt_yolo/package.xml
@@ -24,5 +24,4 @@
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-
 </package>
diff --git a/perception/traffic_light_ssd_fine_detector/package.xml b/perception/traffic_light_ssd_fine_detector/package.xml
@@ -10,7 +10,6 @@
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
   <maintainer email="daisuke.nishimatsu@tier4.jp">Daisuke Nishimatsu</maintainer>
 
-
   <!-- One license tag required, multiple allowed, one license per tag -->
   <!-- Commonly used license strings: -->
   <!--   BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->

diff --git a/planning/obstacle_stop_planner/package.xml b/planning/obstacle_stop_planner/package.xml
@@ -37,5 +37,4 @@
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-
 </package>
diff --git a/planning/planning_error_monitor/package.xml b/planning/planning_error_monitor/package.xml
@@ -2,7 +2,7 @@
 <package format="3">
   <name>planning_error_monitor</name>
   <version>0.1.0</version>
-  <description>ros node for monitoring planning error </description>
+  <description>ros node for monitoring planning error</description>
 
   <maintainer email="yutaka.shimizu@tier4.jp">Yutaka Shimizu</maintainer>
 

diff --git a/sensing/image_transport_decompressor/package.xml b/sensing/image_transport_decompressor/package.xml
@@ -24,6 +24,4 @@
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-
-
 </package>
diff --git a/system/dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml b/system/dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml
@@ -5,13 +5,11 @@
   <arg name="status" default="0" />
 
   <group>
-    <push-ros-namespace namespace="dummy_diag_publisher"/>
-
-    <node pkg="dummy_diag_publisher" exec="dummy_diag_publisher" name="$(var diag_name)" output="screen">
-      <param name="diag_name" value="$(var diag_name)" />
-      <param name="update_rate" value="$(var update_rate)" />
-      <param name="is_active" value="$(var is_active)" />
-      <param name="status" value="$(var status)" />
+    <node pkg="dummy_diag_publisher" exec="dummy_diag_publisher" name="$(anon dummy_diag_publisher)" output="screen">
+      <param name="diag_name" value="$(var diag_name)"/>
+      <param name="update_rate" value="$(var update_rate)"/>
+      <param name="is_active" value="$(var is_active)"/>
+      <param name="status" value="$(var status)"/>
     </node>
   </group>
 </launch>