Skip to content

Commit

Permalink
Merge pull request #183 from tier4/sync-upstream
Browse files Browse the repository at this point in the history
chore: sync upstream
  • Loading branch information
tier4-autoware-public-bot[bot] authored Nov 23, 2022
2 parents b9a7cd1 + eb9fcec commit 784db07
Show file tree
Hide file tree
Showing 184 changed files with 5,457 additions and 3,971 deletions.
3 changes: 3 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ IncludeCategories:
- Regex: .*_msgs/.*
Priority: 3
CaseSensitive: true
- Regex: .*_srvs/.*
Priority: 3
CaseSensitive: true
# Other Package headers
- Regex: <.*>
Priority: 2
Expand Down
321 changes: 161 additions & 160 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions .github/labeler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ ci:
- .clang-format
- .gitignore
- .prettierignore
document:
documentation:
- docs/**/*
- "**/*.txt"
- "**/*.md"
- "**/*.rst"
- "**/*.jpg"
Expand Down
1 change: 1 addition & 0 deletions .github/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
- source: .github/workflows/clang-tidy-pr-comments.yaml
- source: .github/workflows/clang-tidy-pr-comments-manually.yaml
- source: .github/workflows/update-codeowners-from-packages.yaml
- source: .pre-commit-config.yaml
- source: codecov.yaml

- repository: autowarefoundation/autoware-documentation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
prevent-no-label-execution:
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
with:
label: documentation
label: deploy-docs

deploy-docs:
needs: prevent-no-label-execution
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update-codeowners-from-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
uses: autowarefoundation/autoware-github-actions/update-codeowners-from-packages@v1
with:
token: ${{ steps.generate-token.outputs.token }}
global-codeowners: "@autowarefoundation/autoware-global-codeowners"
pr-labels: |
bot
update-codeowners-from-packages
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright 2022 TIER IV, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_
#define AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/mrm_state.hpp>

namespace autoware_ad_api::fail_safe
{

struct MrmState
{
using Message = autoware_adapi_v1_msgs::msg::MrmState;
static constexpr char name[] = "/api/fail_safe/mrm_state";
static constexpr size_t depth = 1;
static constexpr auto reliability = RMW_QOS_POLICY_RELIABILITY_RELIABLE;
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
};

} // namespace autoware_ad_api::fail_safe

#endif // AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_
40 changes: 0 additions & 40 deletions common/autoware_auto_common/include/common/types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,46 +109,6 @@ struct COMMON_PUBLIC PointXYZI
}
};

struct COMMON_PUBLIC PointXYZ
{
float32_t x{0.0F};
float32_t y{0.0F};
float32_t z{0.0F};
friend bool operator==(const PointXYZ & p1, const PointXYZ & p2) noexcept
{
return helper_functions::comparisons::rel_eq(
p1.x, p2.x, std::numeric_limits<float32_t>::epsilon()) &&

helper_functions::comparisons::rel_eq(
p1.y, p2.y, std::numeric_limits<float32_t>::epsilon()) &&

helper_functions::comparisons::rel_eq(
p1.z, p2.z, std::numeric_limits<float32_t>::epsilon());
}
};

struct COMMON_PUBLIC PointXYZTimestamp
{
float32_t x{0.0F};
float32_t y{0.0F};
float32_t z{0.0F};
float32_t time_stamp{0.0F};
friend bool operator==(const PointXYZTimestamp & p1, const PointXYZTimestamp & p2) noexcept
{
return helper_functions::comparisons::rel_eq(
p1.x, p2.x, std::numeric_limits<float32_t>::epsilon()) &&

helper_functions::comparisons::rel_eq(
p1.y, p2.y, std::numeric_limits<float32_t>::epsilon()) &&

helper_functions::comparisons::rel_eq(
p1.z, p2.z, std::numeric_limits<float32_t>::epsilon()) &&

helper_functions::comparisons::rel_eq(
p1.time_stamp, p2.time_stamp, std::numeric_limits<float32_t>::epsilon());
}
};

using PointBlock = std::vector<PointXYZIF>;
using PointPtrBlock = std::vector<const PointXYZIF *>;
/// \brief Stores basic configuration information, does some simple validity checking
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,23 @@

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/mrm_state.hpp>
#include <autoware_adapi_v1_msgs/msg/operation_mode_state.hpp>
#include <tier4_system_msgs/srv/change_autoware_control.hpp>
#include <tier4_system_msgs/srv/change_operation_mode.hpp>

namespace system_interface
{

struct MrmState
{
using Message = autoware_adapi_v1_msgs::msg::MrmState;
static constexpr char name[] = "/system/fail_safe/mrm_state";
static constexpr size_t depth = 1;
static constexpr auto reliability = RMW_QOS_POLICY_RELIABILITY_RELIABLE;
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_VOLATILE;
};

struct ChangeAutowareControl
{
using Service = tier4_system_msgs::srv::ChangeAutowareControl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ class ServiceException : public std::exception
template <class T>
void set(T & status) const
{
status.success = false;
status.success = success_;
status.code = code_;
status.message = message_;
}

ResponseStatus status() const
{
ResponseStatus status;
status.success = false;
status.success = success_;
status.code = code_;
status.message = message_;
return status;
Expand Down
41 changes: 0 additions & 41 deletions common/motion_common/CMakeLists.txt

This file was deleted.

163 changes: 0 additions & 163 deletions common/motion_common/include/motion_common/config.hpp

This file was deleted.

Loading

0 comments on commit 784db07

Please sign in to comment.