Skip to content
Snippets Groups Projects
Commit 5039a138 authored by Anastasiia Volkova's avatar Anastasiia Volkova
Browse files

Merge branch 'remove_external_control_state' into 'main'

fix: Remove external control state

See merge request !142
parents 56bbd8dd 80ed6663
No related branches found
Tags v3.0.0
1 merge request!142fix: Remove external control state
Pipeline #46539 passed
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2021-2023, Bayerische Motoren Werke Aktiengesellschaft (BMW AG) * Copyright (c) 2021-2024, Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
* Copyright (c) 2022 Ansys, Inc. * Copyright (c) 2022 Ansys, Inc.
* *
* This program and the accompanying materials are made * This program and the accompanying materials are made
...@@ -128,24 +128,15 @@ enum class IndicatorState ...@@ -128,24 +128,15 @@ enum class IndicatorState
kWarning = 5 kWarning = 5
}; };
/// Specify external control of a vehicle.
enum class ExternalControlState
{
kOff = 0,
kFull = 1,
kLateralOnly = 2,
kLongitudinalOnly = 3
};
/// This struct represents the performance properties of the vehicle /// This struct represents the performance properties of the vehicle
struct Performance struct Performance
{ {
/// Maximum speed of the vehicle /// Maximum speed of the vehicle
units::velocity::meters_per_second_t max_speed{std::numeric_limits<double>::infinity()}; units::velocity::meters_per_second_t max_speed{std::numeric_limits<double>::infinity()};
/// Maximum acceleration of the vehicle /// Maximum acceleration of the vehicle
units::acceleration::meters_per_second_squared_t max_acceleration{std::numeric_limits<double>::infinity()}; units::acceleration::meters_per_second_squared_t max_acceleration{std::numeric_limits<double>::infinity()};
/// Maximum deceleration of the vehicle /// Maximum deceleration of the vehicle
units::acceleration::meters_per_second_squared_t max_deceleration{std::numeric_limits<double>::infinity()};; units::acceleration::meters_per_second_squared_t max_deceleration{std::numeric_limits<double>::infinity()};
/// Maximum acceleration rate of the vehicle. If omitted then infinity is assumed /// Maximum acceleration rate of the vehicle. If omitted then infinity is assumed
units::jerk::meters_per_second_cubed_t max_acceleration_rate{std::numeric_limits<double>::infinity()}; units::jerk::meters_per_second_cubed_t max_acceleration_rate{std::numeric_limits<double>::infinity()};
/// Maximum deceleration rate of the vehicle. If omitted then infinity is assumed /// Maximum deceleration rate of the vehicle. If omitted then infinity is assumed
...@@ -230,7 +221,7 @@ struct PedestrianProperties : public EntityProperties ...@@ -230,7 +221,7 @@ struct PedestrianProperties : public EntityProperties
{ {
}; };
/// Specifies the type of a static object. /// Specifies the type of a static object.
/// The values are derived from ASAM OSI stationary object type /// The values are derived from ASAM OSI stationary object type
enum class StaticObjectType enum class StaticObjectType
{ {
...@@ -278,7 +269,7 @@ struct StaticObjectProperties : public EntityProperties ...@@ -278,7 +269,7 @@ struct StaticObjectProperties : public EntityProperties
{ {
/// Type of the static object (bridge, pole,...) /// Type of the static object (bridge, pole,...)
StaticObjectType static_object_type{StaticObjectType::kOther}; StaticObjectType static_object_type{StaticObjectType::kOther};
/// Amount to shift position along lane normal. /// Amount to shift position along lane normal.
/// It allows static objects like traffic signs to be placed at certain amount above the road. /// It allows static objects like traffic signs to be placed at certain amount above the road.
/// It is considered when the position of the entity is set. /// It is considered when the position of the entity is set.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment