Skip to content

Commit a5188ec

Browse files
Carsten KueblerCarsten Kuebler
authored andcommitted
Update comments and reformat documentation
Update comments Reformat comments (max 80 chars).
1 parent 4d07544 commit a5188ec

File tree

2 files changed

+72
-56
lines changed

2 files changed

+72
-56
lines changed

osi_common.proto

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ package osi;
66

77

88
//
9-
// \brief A cartesian 3D vector for positions, velocities or accelerations or its uncertainties.
10-
//
9+
// \brief A cartesian 3D vector for positions, velocities or accelerations or
10+
// its uncertainties.
11+
//
1112
// Units are [m] for positions, [m/s] for velocities and [m/s^2] for accelerations.
1213
//
1314
// The coordinate system is defined as right-handed.
@@ -16,55 +17,64 @@ message Vector3d
1617
{
1718
// The x coordinate.
1819
//
20+
// Unit [m] [m/s] or [m/s^2]
1921
optional double x = 1;
2022

2123
// The y coordinate.
2224
//
25+
// Unit [m] [m/s] or [m/s^2]
2326
optional double y = 2;
2427

2528
// The z coordinate.
2629
//
30+
// Unit [m] [m/s] or [m/s^2]
2731
optional double z = 3;
2832
}
2933

3034
//
31-
// \brief A cartesian 2D vector for positions, velocities or accelerations or its uncertainties.
32-
//
35+
// \brief A cartesian 2D vector for positions, velocities or accelerations or
36+
// its uncertainties.
37+
//
3338
// Units are [m] for positions, [m/s] for velocities and [m/s^2] for accelerations.
3439
//
3540
message Vector2d
3641
{
3742
// The x coordinate.
3843
//
44+
// Unit [m] [m/s] or [m/s^2]
3945
optional double x = 1;
4046

4147
// The y coordinate.
4248
//
49+
// Unit [m] [m/s] or [m/s^2]
4350
optional double y = 2;
4451
}
4552

4653
//
4754
// \brief A timestamp.
4855
//
49-
// Names and types of fields are chosen in accordance to google/protobuf/timestamp.proto to allow a possible switch in the future.
50-
// There is no definition of the zero point in time neither it is the Unix epoch.
51-
// A simulation may start at the zero point in time but it is not mandatory.
52-
//
56+
// Names and types of fields are chosen in accordance to
57+
// google/protobuf/timestamp.proto to allow a possible switch in the future.
58+
// There is no definition of the zero point in time neither it is the Unix
59+
// epoch. A simulation may start at the zero point in time but it is not
60+
// mandatory.
5361
message Timestamp
5462
{
55-
// The number of seconds since the start of e.g. the simulation / system / vehicle.
63+
// The number of seconds since the start of e.g. the simulation / system /
64+
// vehicle.
65+
//
5666
// Unit: [s]
5767
optional int64 seconds = 1;
5868

5969
// The number of nanoseconds since the start of the last second.
70+
//
6071
// Unit: [ns]
6172
optional int32 nanos = 2;
6273
}
6374

6475
//
65-
// \brief The dimension of a 3D box, e.g. the size of a 3D bounding box or its uncertainties.
66-
//
67-
// Units are all [m].
76+
// \brief The dimension of a 3D box, e.g. the size of a 3D bounding box or its
77+
// uncertainties.
6878
//
6979
// The dimensions are positive. Uncertainties are negative or positive.
7080
//
@@ -75,25 +85,26 @@ message Dimension3d
7585
{
7686
// The length of the box.
7787
//
88+
// Unit [m]
7889
optional double length = 1;
7990

8091
// The width of the box.
8192
//
93+
// Unit [m]
8294
optional double width = 2;
8395

8496
// The height of the box.
8597
//
98+
// Unit [m]
8699
optional double height = 3;
87100
}
88101

89102
//
90103
// \brief A 3D orientation, orientation rate or orientation acceleration (i.e.
91104
// derivatives) or its uncertainties denoted in euler angles.
92105
//
93-
// Units are
94-
// \arg [rad] for orientation
95-
// \arg [rad/s] for rates
96-
// \arg [rad/s^2] for accelerations
106+
// Units are [rad] for orientation [rad/s] for rates and [rad/s^2] for
107+
// accelerations
97108
//
98109
// The preferred angular range is (-pi, pi]. The coordinate system is defined as
99110
// right-handed.
@@ -122,14 +133,17 @@ message Orientation3d
122133
{
123134
// The roll angle/rate/acceleration.
124135
//
136+
// Unit: [rad] [rad/s] or [rad/s^2]
125137
optional double roll = 1;
126138

127139
// The pitch angle/rate/acceleration.
128140
//
141+
// Unit: [rad] [rad/s] or [rad/s^2]
129142
optional double pitch = 2;
130143

131144
// The yaw angle/rate/acceleration.
132145
//
146+
// Unit: [rad] [rad/s] or [rad/s^2]
133147
optional double yaw = 3;
134148
}
135149

@@ -175,33 +189,30 @@ message MountingPosition
175189
//
176190
// Used e.g., for low level representations of radar detections.
177191
//
178-
// Units are [m] for radial distance and [rad] for azimuth and elevation angles.
179-
// With the x-axis of the sensor frame pointing in the central viewing direction
180-
// of the sensor, the z-axis pointing upwards and the senor frame being
181-
// right-handed, azimuth and elevation are defined as the rotations that would
182-
// have to be applied to the sensor frame to make its x-axis point towards the
183-
// referenced point or to align it with the referenced vector. The rotations are
184-
// to be performed \b azimuth \b first (around the z-axis) and \b elevation
185-
// \b second (around the new y-axis) to follow the definition of
186-
// OSI:Orientation3D. For the sense of each rotation, the right-hand rule
187-
// applies.
188-
// If azimuth and elevation are zero, the referenced point lies directly ahead
189-
// in the central viewing direction of the sensor, and the respective vector
190-
// points directly in the latter.
192+
// Azimuth and elevation are defined as the rotations that would have to be
193+
// applied to the local frame (e.g sensor frame definition in
194+
// \c OSI:DetectionHeader) to make its x-axis point towards the referenced point
195+
// or to align it with the referenced vector. The rotations are to be performed
196+
// \b azimuth \b first (around the z-axis) and \b elevation \b second (around
197+
// the new y-axis) to follow the definition of \c OSI:Orientation3D. For the
198+
// sense of each rotation, the right-hand rule applies.
191199
//
192200
// vector_cartesian := Rotation(elevation)*Rotation(azimuth)*Unit_vector_x*distance
193201
message Spherical3d
194202
{
195203
// The radial distance.
196204
//
205+
// Unit: [m]
197206
optional double distance = 1;
198207

199208
// The azimuth (horizontal) angle.
200209
//
210+
// Unit: [rad]
201211
optional double azimuth = 2;
202212

203213
// The elevation (vertical) angle.
204214
//
215+
// Unit: [rad]
205216
optional double elevation = 3;
206217
}
207218

osi_featuredata.proto

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,35 +45,40 @@ message DetectionHeader
4545
// for detailed discussions on the semantics of time-related fields.
4646
optional Timestamp measurement_time = 2;
4747

48-
// Monotonous counter to identify the exact cycle.
49-
//
50-
optional uint32 cycle_counter = 3;
51-
52-
// Mounting position of the sensor (origin and orientation of the cartesian
53-
// sensor coordinate system); given relative from the middle of the rear
54-
// axle of the host vehicle coordinate system (see: \c OSI::Vehicle vehicle
55-
// reference point) to the sensor detection coordinate system's origin. The
56-
// sensor detection coordinate system is a spherical polar coordinate system
57-
// (same origin and orientation as cartesian sensor coordinate system).
58-
//
59-
// The sensor detection coordinate system's x-axis must be the angle
60-
// bisector of the sensor's horizontal and vertical field of view in a
61-
// right-handed coordinate system. The xy-plane represents the horizontal
62-
// field of view and the xz-plane the vertical field of view.
48+
// Monotonous counter to identify the exact cycle.
49+
// Generally the detecion function is called periodic and
50+
// \c DetectionHeader::cycle_counter corresponds to the number of periods.
51+
optional uint64 cycle_counter = 3;
52+
53+
54+
// Mounting position of the sensor (origin and orientation of the sensor
55+
// frame). Both origin and orientation are given in and with respect to the
56+
// host vehicle coordinate system (see: \c OSI::Vehicle vehicle reference
57+
// point).
6358
//
64-
// The origin represents the current mounting pose to the best knowledge of
65-
// the sensor. The estimation of the 6D pose given by the calibration. The
66-
// uncertainty of this estimation is given with the corresponding 6D root
67-
// mean squared error. The estimation of the current origin does not include
68-
// effects due to short-time dynamics, such as pitch angles from braking,
69-
// but includes long-time calibration values, such as pitch angles from
70-
// luggage in the trunk.
59+
// The sensor frame's x-axis is pointing in the central viewing direction of
60+
// the sensor. It is the angle bisector of the sensor's horizontal and
61+
// vertical field of view. The terms horizontal and vertical must be
62+
// understood as names for the two principal planes of the sensor's field of
63+
// view (relative to the sensor frame's orientation), which do not have to
64+
// be horizontal or vertical in the strict sense of being parallel or
65+
// perpendicular to the local gravitational vector. The horizontal field
66+
// of view defines the sensor frame's xy-plane and the vertical field
67+
// of view defines the xz-plane. The sensor frame is right-handed and the
68+
// z-axis is pointing in an upward direction.
7169
//
70+
// The sensor frame uses cartesian coordinates. The sensor frame's origin is
71+
// identical to sensor detection frame's origin. Detections are defined in
72+
// the sensor detection frame which uses e.g. spherical coordinates.
7273
optional MountingPosition mounting_position = 4;
7374

74-
// Uncertainty of the mounting pose calibration should be included in the
75-
// interface (x, y, z, yaw, pitch, roll).
76-
//
75+
// The origin/orientation of the sensor frame represents the current
76+
// mounting pose to the best knowledge of the sensor. The estimation of the
77+
// 6D pose given by the calibration. The uncertainty of this estimation is
78+
// given with the corresponding 6D root mean squared error. The estimation
79+
// of the current origin does not include effects due to short-time
80+
// dynamics, such as pitch angles from braking, but includes long-time
81+
// calibration values, such as pitch angles from luggage in the trunk.
7782
optional MountingPosition mounting_position_rmse = 5;
7883

7984
// Data Qualifier expresses to what extent the content of this event can be
@@ -172,7 +177,7 @@ enum DetectionClassification
172177

173178

174179
//
175-
// \brief A list of lidar detection.
180+
// \brief A list of lidar detection from one sensor.
176181
//
177182
message LidarDetectionList
178183
{
@@ -235,7 +240,7 @@ message LidarDetection
235240
}
236241

237242
//
238-
// \brief A list of radar detections.
243+
// \brief A list of radar detections from one sensor.
239244
//
240245
message RadarDetectionList
241246
{

0 commit comments

Comments
 (0)