Skip to content

Commit 6ba10c1

Browse files
jdsikajdsika
committed
Removed SensorDataList, created classification for occupant
1 parent d5ddf41 commit 6ba10c1

File tree

5 files changed

+92
-95
lines changed

5 files changed

+92
-95
lines changed

‎osi_datarecording.proto‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ message SensorDataSeries
1919
repeated SensorData sensor_data = 1;
2020
}
2121

22-
//
23-
// \brief List of \c SensorData interface copies, one for each sensor in the
24-
// vehicle.
25-
//
26-
// Can be used to bundle output of multiple sensors in one transmission.
27-
//
28-
message SensorDataList
29-
{
30-
// List of sensor data for multiple sensors at a specific timestep.
31-
//
32-
repeated SensorData sensor = 1;
33-
}
34-
3522
//
3623
// \brief List of sensors where each element contains a time series of
3724
// \c SensorData messages.

‎osi_detectedobject.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ message DetectedItemHeader
4949
//
5050
optional MeasurementState measurement_state = 5;
5151

52-
// A list of sensors which detected this detected item.
52+
// A list of physical sensors which detected this detected item.
5353
//
5454
// If \c SensorData has detected entities and all detections are missing,
5555
// then e.g. the number of sensors can confirm the
@@ -132,7 +132,7 @@ message DetectedStationaryObject
132132

133133
// The description of the stationary object (e.g. landmark).
134134
//
135-
optional StationaryObject.StationaryObjectClassification classification = 2;
135+
optional StationaryObject.Classification classification = 2;
136136
}
137137
}
138138

‎osi_detectedoccupant.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ message DetectedOccupant
3939
//
4040
optional double probability = 1;
4141

42-
// The detected vehicle occupant.
42+
// The detected vehicle occupant classification.
4343
//
4444
// \note IDs, which are referenced in this message, usually
4545
// reference to \c DetectedXXX::tracking_id IDs.
4646
//
47-
optional Occupant occupant = 2;
47+
optional Occupant.Classification classification = 2;
4848
}
4949
}

‎osi_object.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ message StationaryObject
2525

2626
// Specific information about the classification of the stationary object.
2727
//
28-
optional StationaryObjectClassification classification = 6;
28+
optional Classification classification = 6;
2929

3030
//
3131
// \brief Information regarding the classification of stationary objects.
3232
//
33-
message StationaryObjectClassification
33+
message Classification
3434
{
3535
// The type of the object.
3636
//

‎osi_occupant.proto‎

Lines changed: 86 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -14,107 +14,117 @@ message Occupant
1414
// The ID of the driver.
1515
//
1616
optional Identifier id = 1;
17-
18-
// Flag determining whether the person is the driver of the vehicle or a
19-
// passenger.
17+
18+
// Specific information about the classification of the occupant.
2019
//
21-
optional bool is_driver = 2;
22-
23-
// Seat position of the vehicle occupant.
20+
optional Classification classification = 2;
21+
2422
//
25-
optional Seat seat = 3;
26-
27-
// Describes the state of the passenger's hands related to the steering
28-
// wheel (mostly driver).
23+
// \brief Information regarding the classification of the occupant.
2924
//
30-
optional SteeringControl steering_control = 4;
31-
32-
// Definition of seat positions.
33-
//
34-
enum Seat
25+
message Classification
3526
{
36-
// Seat position is unknown (must not be used in ground truth).
27+
// Flag determining whether the person is the driver of the vehicle or a
28+
// passenger.
3729
//
38-
SEAT_UNKNOWN = 0;
30+
optional bool is_driver = 2;
3931

40-
// Other (unspecified but known) seat.
32+
// Seat position of the vehicle occupant.
4133
//
42-
SEAT_OTHER = 1;
34+
optional Seat seat = 3;
4335

44-
// Seat position is in the front row, left seat.
45-
// This is usually the driver's seat in right-hand traffic.
36+
// Describes the state of the passenger's hands related to the steering
37+
// wheel (mostly driver).
4638
//
47-
SEAT_FRONT_LEFT = 2;
39+
optional SteeringControl steering_control = 4;
4840

49-
// Seat position is in the front row, right seat.
50-
// This is usually the driver's seat in left-hand traffic.
41+
// Definition of seat positions.
5142
//
52-
SEAT_FRONT_RIGHT = 3;
43+
enum Seat
44+
{
45+
// Seat position is unknown (must not be used in ground truth).
46+
//
47+
SEAT_UNKNOWN = 0;
5348

54-
// Seat position is in the front row, middle seat.
55-
//
56-
SEAT_FRONT_MIDDLE = 4;
49+
// Other (unspecified but known) seat.
50+
//
51+
SEAT_OTHER = 1;
5752

58-
// Seat position is in the back row, left seat.
59-
//
60-
SEAT_BACK_LEFT = 5;
53+
// Seat position is in the front row, left seat.
54+
// This is usually the driver's seat in right-hand traffic.
55+
//
56+
SEAT_FRONT_LEFT = 2;
6157

62-
// Seat position is in the back row, right seat.
63-
//
64-
SEAT_BACK_RIGHT = 6;
58+
// Seat position is in the front row, right seat.
59+
// This is usually the driver's seat in left-hand traffic.
60+
//
61+
SEAT_FRONT_RIGHT = 3;
6562

66-
// Seat position is in the back row, middle seat.
67-
//
68-
SEAT_BACK_MIDDLE = 7;
63+
// Seat position is in the front row, middle seat.
64+
//
65+
SEAT_FRONT_MIDDLE = 4;
6966

70-
// Seat position is in the third row, left seat.
71-
//
72-
SEAT_THIRD_ROW_LEFT = 8;
67+
// Seat position is in the back row, left seat.
68+
//
69+
SEAT_BACK_LEFT = 5;
7370

74-
// Seat position is in the third row, right seat.
75-
//
76-
SEAT_THIRD_ROW_RIGHT = 9;
71+
// Seat position is in the back row, right seat.
72+
//
73+
SEAT_BACK_RIGHT = 6;
7774

78-
// Seat position is in the third row, middle seat.
79-
//
80-
SEAT_THIRD_ROW_MIDDLE = 10;
81-
}
75+
// Seat position is in the back row, middle seat.
76+
//
77+
SEAT_BACK_MIDDLE = 7;
8278

83-
// Definition of hands related to the steering wheel (mostly driver).
84-
//
85-
enum SteeringControl
86-
{
87-
// Hands state is unknown (must not be used in ground truth).
88-
//
89-
STEERING_CONTROL_UNKNOWN = 0;
79+
// Seat position is in the third row, left seat.
80+
//
81+
SEAT_THIRD_ROW_LEFT = 8;
9082

91-
// Other (unspecified but known) hand positioning related to the
92-
// steering wheel.
93-
//
94-
STEERING_CONTROL_OTHER = 1;
83+
// Seat position is in the third row, right seat.
84+
//
85+
SEAT_THIRD_ROW_RIGHT = 9;
9586

96-
// Hands are not on the steering wheel.
97-
//
98-
STEERING_CONTROL_NO_HAND = 2;
87+
// Seat position is in the third row, middle seat.
88+
//
89+
SEAT_THIRD_ROW_MIDDLE = 10;
90+
}
9991

100-
// One hand is on the steering wheel. Whether it is the left or right
101-
// hand is unspecified or unknown.
102-
//
103-
// \note If there is no differentiation between one or both hands on the
104-
// steering wheel, this value should be used.
92+
// Definition of hands related to the steering wheel (mostly driver).
10593
//
106-
STEERING_CONTROL_ONE_HAND = 3;
94+
enum SteeringControl
95+
{
96+
// Hands state is unknown (must not be used in ground truth).
97+
//
98+
STEERING_CONTROL_UNKNOWN = 0;
10799

108-
// Both hands are on the steering wheel.
109-
//
110-
STEERING_CONTROL_BOTH_HANDS = 4;
100+
// Other (unspecified but known) hand positioning related to the
101+
// steering wheel.
102+
//
103+
STEERING_CONTROL_OTHER = 1;
111104

112-
// Only left hand is on the steering wheel.
113-
//
114-
STEERING_CONTROL_LEFT_HAND = 5;
105+
// Hands are not on the steering wheel.
106+
//
107+
STEERING_CONTROL_NO_HAND = 2;
115108

116-
// Only right hand is on the steering wheel.
117-
//
118-
STEERING_CONTROL_RIGHT_HAND = 6;
109+
// One hand is on the steering wheel. Whether it is the left or right
110+
// hand is unspecified or unknown.
111+
//
112+
// \note If there is no differentiation between one or both hands on the
113+
// steering wheel, this value should be used.
114+
//
115+
STEERING_CONTROL_ONE_HAND = 3;
116+
117+
// Both hands are on the steering wheel.
118+
//
119+
STEERING_CONTROL_BOTH_HANDS = 4;
120+
121+
// Only left hand is on the steering wheel.
122+
//
123+
STEERING_CONTROL_LEFT_HAND = 5;
124+
125+
// Only right hand is on the steering wheel.
126+
//
127+
STEERING_CONTROL_RIGHT_HAND = 6;
128+
}
119129
}
120130
}

0 commit comments

Comments
 (0)