chore: sync upstream

.github/dependabot.yaml

@@ -5,3 +5,6 @@ updates:
     schedule:
       interval: daily
     open-pull-requests-limit: 1
+    labels:
+      - bot
+      - github-actions

.github/sync-files.yaml

@@ -35,6 +35,7 @@
     - source: .github/workflows/build-and-test-self-hosted.yaml
     - source: .github/workflows/check-build-depends.yaml
     - source: .github/workflows/clang-tidy-pr-comments.yaml
+    - source: codecov.yaml
 
 - repository: autowarefoundation/autoware-documentation
   files:

.github/workflows/pre-commit.yaml

@@ -5,12 +5,28 @@ on:
 
 jobs:
   pre-commit:
+    if: ${{ github.event.repository.private }}
     runs-on: ubuntu-latest
     steps:
+      - name: Generate token
+        id: generate-token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.PRIVATE_KEY }}
+
       - name: Check out repository
         uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - name: Set git config
+        uses: autowarefoundation/autoware-github-actions/set-git-config@v1
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
 
       - name: Run pre-commit
         uses: autowarefoundation/autoware-github-actions/pre-commit@v1
         with:
           pre-commit-config: .pre-commit-config.yaml
+          token: ${{ steps.generate-token.outputs.token }}

.github/workflows/sync-files.yaml

@@ -20,3 +20,7 @@ jobs:
         uses: autowarefoundation/autoware-github-actions/sync-files@v1
         with:
           token: ${{ steps.generate-token.outputs.token }}
+          pr-labels: |
+            bot
+            sync-files
+          auto-merge-method: squash

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: check-json
       - id: check-merge-conflict

common/tier4_perception_rviz_plugin/src/tools/interactive_object.cpp

@@ -114,12 +114,12 @@ void InteractiveObject::update(const Ogre::Vector3 & point)
              : std::atan2(velocity_.y, velocity_.x);
 }
 
+void InteractiveObject::reset() { velocity_ = Ogre::Vector3::ZERO; }
+
 double InteractiveObject::distance(const Ogre::Vector3 & point) { return point_.distance(point); }
 
 InteractiveObjectCollection::InteractiveObjectCollection() { target_ = nullptr; }
 
-void InteractiveObjectCollection::reset() { target_ = nullptr; }
-
 void InteractiveObjectCollection::select(const Ogre::Vector3 & point)
 {
   const size_t index = nearest(point);
@@ -128,6 +128,19 @@ void InteractiveObjectCollection::select(const Ogre::Vector3 & point)
   }
 }
 
+boost::optional<std::array<uint8_t, 16>> InteractiveObjectCollection::reset()
+{
+  if (!target_) {
+    return {};
+  }
+
+  const auto uuid = target_->uuid();
+  target_->reset();
+  target_ = nullptr;
+
+  return uuid;
+}
+
 boost::optional<std::array<uint8_t, 16>> InteractiveObjectCollection::create(
   const Ogre::Vector3 & point)
 {
@@ -304,7 +317,8 @@ int InteractiveObjectTool::processMouseEvent(rviz_common::ViewportMouseEvent & e
   }
 
   if (event.rightUp()) {
-    objects_.reset();
+    const auto uuid = objects_.reset();
+    publishObjectMsg(uuid.get(), Object::MODIFY);
     return 0;
   }
 

common/tier4_perception_rviz_plugin/src/tools/interactive_object.hpp

@@ -90,6 +90,7 @@ class InteractiveObject
   void twist(geometry_msgs::msg::Twist & twist) const;
   void transform(tf2::Transform & tf_map2object) const;
   void update(const Ogre::Vector3 & point);
+  void reset();
   double distance(const Ogre::Vector3 & point);
 
 private:
@@ -105,8 +106,8 @@ class InteractiveObjectCollection
   InteractiveObjectCollection();
   ~InteractiveObjectCollection() {}
 
-  void reset();
   void select(const Ogre::Vector3 & point);
+  boost::optional<std::array<uint8_t, 16>> reset();
   boost::optional<std::array<uint8_t, 16>> create(const Ogre::Vector3 & point);
   boost::optional<std::array<uint8_t, 16>> remove(const Ogre::Vector3 & point);
   boost::optional<std::array<uint8_t, 16>> update(const Ogre::Vector3 & point);

common/tier4_state_rviz_plugin/src/autoware_state_panel.cpp

@@ -109,7 +109,7 @@ void AutowareStatePanel::onInitialize()
   sub_gear_ = raw_node_->create_subscription<autoware_auto_vehicle_msgs::msg::GearReport>(
     "/vehicle/status/gear_status", 10, std::bind(&AutowareStatePanel::onShift, this, _1));
 
-  sub_engage_ = raw_node_->create_subscription<tier4_external_api_msgs::msg::EngageStatus>(
+  sub_engage_ = raw_node_->create_subscription<autoware_auto_vehicle_msgs::msg::Engage>(
     "/api/autoware/get/engage", 10, std::bind(&AutowareStatePanel::onEngageStatus, this, _1));
 
   client_engage_ = raw_node_->create_client<tier4_external_api_msgs::srv::Engage>(
@@ -209,7 +209,7 @@ void AutowareStatePanel::onShift(
 }
 
 void AutowareStatePanel::onEngageStatus(
-  const tier4_external_api_msgs::msg::EngageStatus::ConstSharedPtr msg)
+  const autoware_auto_vehicle_msgs::msg::Engage::ConstSharedPtr msg)
 {
   current_engage_ = msg->engage;
   engage_status_label_ptr_->setText(QString::fromStdString(Bool2String(current_engage_)));

common/tier4_state_rviz_plugin/src/autoware_state_panel.hpp

@@ -23,10 +23,10 @@
 #include <rviz_common/panel.hpp>
 
 #include <autoware_auto_system_msgs/msg/autoware_state.hpp>
+#include <autoware_auto_vehicle_msgs/msg/engage.hpp>
 #include <autoware_auto_vehicle_msgs/msg/gear_report.hpp>
 #include <tier4_control_msgs/msg/external_command_selector_mode.hpp>
 #include <tier4_control_msgs/msg/gate_mode.hpp>
-#include <tier4_external_api_msgs/msg/engage_status.hpp>
 #include <tier4_external_api_msgs/srv/engage.hpp>
 
 namespace rviz_plugins
@@ -48,7 +48,7 @@ public Q_SLOTS:
     const tier4_control_msgs::msg::ExternalCommandSelectorMode::ConstSharedPtr msg);
   void onAutowareState(const autoware_auto_system_msgs::msg::AutowareState::ConstSharedPtr msg);
   void onShift(const autoware_auto_vehicle_msgs::msg::GearReport::ConstSharedPtr msg);
-  void onEngageStatus(const tier4_external_api_msgs::msg::EngageStatus::ConstSharedPtr msg);
+  void onEngageStatus(const autoware_auto_vehicle_msgs::msg::Engage::ConstSharedPtr msg);
 
   rclcpp::Node::SharedPtr raw_node_;
   rclcpp::Subscription<tier4_control_msgs::msg::GateMode>::SharedPtr sub_gate_mode_;
@@ -57,7 +57,7 @@ public Q_SLOTS:
   rclcpp::Subscription<autoware_auto_system_msgs::msg::AutowareState>::SharedPtr
     sub_autoware_state_;
   rclcpp::Subscription<autoware_auto_vehicle_msgs::msg::GearReport>::SharedPtr sub_gear_;
-  rclcpp::Subscription<tier4_external_api_msgs::msg::EngageStatus>::SharedPtr sub_engage_;
+  rclcpp::Subscription<autoware_auto_vehicle_msgs::msg::Engage>::SharedPtr sub_engage_;
 
   rclcpp::Client<tier4_external_api_msgs::srv::Engage>::SharedPtr client_engage_;