Skip to content
Closed
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
700454f
Create osi_adas_function.proto
ThomasNaderBMW Mar 12, 2019
d0dc381
Create osi_driver_inputs.proto
ThomasNaderBMW Mar 12, 2019
4329a4a
Create osi_vehicle.proto
ThomasNaderBMW Mar 12, 2019
b6db92d
Update osi_common.proto
ThomasNaderBMW Mar 12, 2019
92764be
Update osi_environment.proto
ThomasNaderBMW Mar 12, 2019
a613586
Update osi_adas_function.proto
ThomasNaderBMW Mar 12, 2019
2f2eb6b
Update osi_driver_inputs.proto
ThomasNaderBMW Mar 12, 2019
3e2cfe4
Update osi_vehicle.proto
ThomasNaderBMW Mar 12, 2019
7d6f354
Merge branch 'master' into Extension_ADAS_Vehicle_DriverInputs
jdsika Mar 26, 2019
086285f
fixed unit doxygen comment
jdsika Apr 10, 2019
18d4423
Update osi_common.proto
ThomasNaderBMW Apr 10, 2019
b34ace2
Update osi_vehicle.proto
ThomasNaderBMW Apr 11, 2019
22d7381
Update osi_driver_inputs.proto
ThomasNaderBMW Apr 11, 2019
7637b1a
Improving coding style along with units (#317)
ainar May 10, 2019
a36db65
Merge branch 'master' into Extension_ADAS_Vehicle_DriverInputs
jdsika May 21, 2019
64d521d
Extension adas vehicle driver inputs (#328)
ainar May 28, 2019
acb42de
Merge branch 'master' into Extension_ADAS_Vehicle_DriverInputs
jdsika May 28, 2019
f6154b5
Update osi_adas_function.proto
jdsika May 28, 2019
b801ab1
added hyperlink to unix_timestamp
jdsika May 28, 2019
ed4a2ad
Update osi_environment.proto
jdsika May 28, 2019
629f724
Extended focus from ADAS to driver assistance functions
May 28, 2019
19afa53
Added additional values to wheel-struct (#309)
RobertMengerBMW Jun 6, 2019
c414b3f
Spaces and unit correction (#333)
ainar Jul 9, 2019
2b1cfe2
update of Gear (->GearLeverState) message
Jul 10, 2019
cf1047c
Corrected types and field numbers
Jul 11, 2019
69555f8
removed spaces
jdsika Jul 11, 2019
78d51df
Merge pull request #334 from ainar/Extension_ADAS_Vehicle_DriverInputs
ThomasNaderBMW Jul 12, 2019
d841f2e
Merge branch 'master' into Extension_ADAS_Vehicle_DriverInputs
jdsika Jul 12, 2019
8aadc3e
Deleted wrong Naming in message OsiVehicle to Vehicle
ThomasNaderBMW Jul 12, 2019
dae65fe
Merge branch 'master' into Extension_ADAS_Vehicle_DriverInputs
jdsika Jul 18, 2019
1fcefc3
Fixed message numbering in osi_environment.proto. Removed tabs
jdsika Aug 8, 2019
39fb198
Replaced tabs. Corrected the enums in osi_common.proto
jdsika Aug 8, 2019
f29bed3
Fix enums. Fix numbering in osi_environment.proto
jdsika Aug 8, 2019
f78b959
Added newline at the end of osi_vehicle.proto
jdsika Aug 8, 2019
ce0919d
bugfix setup.py and osi_driver_inputs.proto
0815-code Oct 19, 2019
fa16e57
Merge branch 'master' into Extension_ADAS_Vehicle_DriverInputs
jdsika Oct 22, 2019
bd8c15c
remove forbidden tabs
jdsika Oct 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 208 additions & 0 deletions osi_adas_function.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
syntax = "proto2";

option optimize_for = SPEED;

import "osi_common.proto";

package osi3;

//
// \brief An Interface to describe the communication of an ADAS-function.
// This proto is in far parts complementary to the osi_driver_inputs.proto.
// The inputs are divided into states and requests.
//
message AdasFunction
{
//
// States the ADAS-function can set.
//
optional FunctionStates function_states = 1;

//
// Requests of the ADAS-function.
//
optional FunctionRequests function_requests = 2;

//
// \brief An Interface to describe the communication of an ADAS-function.
// The first set of signals are states the function sets internally
// and are relevant for the vehicle state.
//
message FunctionStates
{
// States of an ADAS-Function (SAE Level 3).
//
optional HadPilot hadpilot = 1;

// States of the longitudinal control.
//
optional LongitudinalControl longitudinal_control = 2;

// States of the lateral control.
//
optional LateralControl lateral_control = 3;

// States of function Emergency-Brake-Assistant.
//
optional EmergencyBrakeAssistant emergency_brake_assistant = 4;

// Request that the driver has to take over.
// 0=Off; 1=On
//
optional bool driver_take_over_request = 5;

// Color of the steering wheel (e.g. to show the driving mode).
// See osi_common_extension.
//
optional ColorformatRGB steering_wheel_lighting_color = 6;

// Requested state of the blindspot-lights (often in the side mirrors).
//
optional BlindSpotWarning blind_spot_warning = 7;

// Defined states of the possible blind spot warnings.
//
enum BlindSpotWarning
{
// No warning.
//
BLIND_SPOT_WARNING_NONE = 0;

// Left warning.
//
BLIND_SPOT_WARNING_LEFT = 1;

// Right warning.
//
BLIND_SPOT_WARNING_RIGHT = 2;

// Warning on both sides.
//
BLIND_SPOT_WARNING_BOTH = 3;
}
}

//
// \brief An Interface to describe the communication of an ADAS-function.
// This proto is in far parts complementary to the osi_driver_inputs.proto.
// The inputs are divided into states and requests.
//
// The first set of signals are states the function sets internally
// and are relevant for the vehicle state.
//
message FunctionRequests
{
// All information about the trajectory the vehicle should follow.
// See osi_common_extension.
//
optional Trajectory trajectory = 1;

// Angle, angle-speed and torque.
// See osi_common_extension.
//
optional Steeringwheel steeringwheel = 2;

// Factor to scale the steeringtorque of the function output.
// 0-1 (0 = no force of the function, 0.5 = half the force, 1 = 100% Torque).
//
optional double steering_override_factor = 3;

// Acceleration-, brakepedal and clutch.
// See osi_common_extension.
//
optional Pedalry pedalry = 4;

// Position of the handbrake.
// 0-100 (percentage of position: Released - fully pressed)
//
optional double handbrake = 5;

// This is a description of the possible indicatorstates.
//
optional Indicators indicators = 6;

// This is a description of the possible indicatorstates.
//
enum Indicators
{
// No indicator.
//
INDICATORS_NONE = 0;

// Left-indicator.
//
INDICATORS_LEFT = 1;

// Right-indicator.
//
INDICATORS_RIGHT = 2;

// Warning lights.
//
INDICATORS_ALL = 3;
}
}
}

//
// \brief A description for highly automated driving (SAE Level 3).
//
//
message HadPilot
{
// Activationstate of the function.
//
optional bool is_activated = 1;

// This is the speed the function targets.
// E.g.: At the point of activation, the actual speed could be 80 km/h,
// but the function tries to accelerate to 130 km/h.
// In [km/h].
//
optional double targeted_speed = 2;
}

//
// \brief A description for the function longitudinal control.
//
//
message LongitudinalControl
{
// Activationstate of the function.
//
optional bool is_activated = 1;

// This is the speed the function targets.
// E.g.: At the point of activation, the actual speed could be 80 km/h,
// but the function tries to accelerate to 130 km/h.
// In [km/h].
//
optional double targeted_speed = 2;

// The timegap describes the minimumdistance to the next vehicle in front.
// In [s].
//
optional double timegap = 3;
}

//
// \brief A description for the function lateral control.
//
//
message LateralControl
{
// Activationstate of the function.
//
optional bool is_activated = 1;
}

//
// \brief A description for the function emergency brake assistant.
//
//
message EmergencyBrakeAssistant
{
// Activationstate of the function.
//
optional bool is_activated = 1;
}
Loading