Skip to content
Closed
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
4312db9
Extension by HMI-, ADAS- and Dynamic-Values
ThomasNaderBMW Oct 24, 2018
3a843fa
Updated all formular failures (not permitted tabs and missing comments)
ThomasNaderBMW Oct 25, 2018
9b6a571
Corrected all coding-style-mistakes.
ThomasNaderBMW Oct 25, 2018
229d818
Corrected all coding-style-mistakes.
ThomasNaderBMW Oct 25, 2018
41dda82
Corrected all coding-style-mistakes.
ThomasNaderBMW Oct 25, 2018
91dc773
Corrected all coding-style-mistakes.
ThomasNaderBMW Oct 25, 2018
cd52750
Corrected all coding-style-mistakes.
ThomasNaderBMW Oct 25, 2018
b287f06
Corrected all coding-style-mistakes.
ThomasNaderBMW Oct 25, 2018
c6c8247
Corrected all coding-style-mistakes.
ThomasNaderBMW Oct 25, 2018
4121c8c
Corrected all coding-style-mistakes.
ThomasNaderBMW Oct 25, 2018
efcfc0d
tab-mistake
ThomasNaderBMW Oct 25, 2018
5f40263
tab-mistake.
ThomasNaderBMW Oct 25, 2018
14c3c27
tab-mistake.
ThomasNaderBMW Oct 25, 2018
43610bd
Missing \brief
ThomasNaderBMW Oct 25, 2018
faa515f
Deleted "ambienttemperature"
ThomasNaderBMW Nov 15, 2018
acb2819
Transferred some values to osi_vehicle.
ThomasNaderBMW Nov 30, 2018
171b784
Added Friction Coefficients and Tire Contact Points.
ThomasNaderBMW Nov 30, 2018
b95cdbf
Extension by wheels-format.
ThomasNaderBMW Nov 30, 2018
33eb6b1
Updated the Wheels-Message.
ThomasNaderBMW Nov 30, 2018
136a017
Merge branch 'master' into OSI_Extension_HMI_ADAS_Dynamic
jdsika Dec 11, 2018
d174ff6
speed -> rotational_speed
ThomasNaderBMW Dec 11, 2018
4bd9444
Corrected type (prob. copy-paste-mistake): optional bool timegap = 3 …
ThomasNaderBMW Dec 11, 2018
6b291b3
Extended Description
ThomasNaderBMW Dec 13, 2018
3da08fc
deleted pilot_level_3 signal cause it was doubled
ThomasNaderBMW Dec 13, 2018
5bc4710
Merge branch 'master' into OSI_Extension_HMI_ADAS_Dynamic
jdsika Dec 14, 2018
23b0b81
Merge branch 'master' into OSI_Extension_HMI_ADAS_Dynamic
jdsika Dec 19, 2018
c964ef5
Added electrical_energy_consumption
ThomasNaderBMW Dec 20, 2018
b0819ed
Corrected Naming
ThomasNaderBMW Dec 20, 2018
c04e1b0
Corrected enum-definitions
ThomasNaderBMW Jan 16, 2019
a5c4503
Update osi_common_extension.proto
ThomasNaderBMW Jan 16, 2019
08db67f
moved Wheels to osi_vehicle
ThomasNaderBMW Jan 16, 2019
faa06f1
Update osi_driver_inputs.proto
ThomasNaderBMW Jan 16, 2019
724b8b6
Update osi_driver_inputs.proto
ThomasNaderBMW Jan 16, 2019
37460cc
Corrected the senseful use of the message
ThomasNaderBMW Jan 16, 2019
94a7934
Corrected OSI-Vehicle
ThomasNaderBMW Jan 17, 2019
550d812
Update osi_adas_function.proto
ThomasNaderBMW Jan 17, 2019
9397b9b
Update osi_common_extension.proto
ThomasNaderBMW Jan 17, 2019
a243522
Update osi_common_extension.proto
ThomasNaderBMW Jan 17, 2019
5497acd
Update osi_adas_function.proto
ThomasNaderBMW Jan 17, 2019
c21be51
Moved definitions to adas
ThomasNaderBMW Jan 17, 2019
554382a
Update osi_driver_inputs.proto
ThomasNaderBMW Jan 17, 2019
dc36283
Update osi_driver_inputs.proto
ThomasNaderBMW Jan 17, 2019
a44a354
Merge branch 'master' into OSI_Extension_HMI_ADAS_Dynamic
jdsika Mar 5, 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
123 changes: 123 additions & 0 deletions osi_adas_function.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
syntax = "proto2";

option optimize_for = SPEED;

import "osi_common.proto";
import "osi_common_extension.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.
//
// 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 AdasSAELevel3 adas_saelevel3 = 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;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Way too specific in my opinion. If we start putting in something like this, you can basically argue to put in any system separately that any autonomous vehicle of any manufacturer might have, e.g. CyclistWarningAssistant, SpeedLimitAssistant, ActiveSideCollisionPreventionAssistant and so on. That has to be done in a better way, maybe by some dynamic content that is filled depending on configuration, with a set of possible values that we can define in OSI.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point. The dynamic-way could be a good solution. Sth that has to be discussed also with @CarloVanDriestenBMW and @pmai


// 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).
//
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type FunctionRequests is not refereed anywhere!
In OSI the entry can be only SensorData or SensorView

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not a type but a messagename or do I miss sth (here and in some other cases before)?!?

{
// 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.
//
enum Indicators
{
// No indicator.
//
INDICATORS_NONE = 0;

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

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

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