Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2309cf5
Review documentation and add BaseStationary to supplementary signs
carsten-kuebler Mar 22, 2018
84fa546
Regularized the Doxygen comments.
carsten-kuebler Mar 22, 2018
c4e4fec
Regularized the Doxygen comments.
carsten-kuebler Mar 22, 2018
cdc331c
Regularized the Doxygen comments.
carsten-kuebler Mar 22, 2018
caa1403
Regularized the Doxygen comments.
carsten-kuebler Mar 22, 2018
3f4abab
Bugfix
carsten-kuebler Mar 22, 2018
a2051e2
Fix links.
carsten-kuebler Mar 22, 2018
86c57f3
Regularized the Doxygen comments.
carsten-kuebler Mar 22, 2018
5383b02
Regularized the Doxygen comments.
carsten-kuebler Mar 22, 2018
47e3445
Fix doxygen links.
carsten-kuebler Mar 22, 2018
b0afb29
Regularized the Doxygen comments.
carsten-kuebler Mar 22, 2018
98db423
Merge branch 'master' into Documentation-Review3
carsten-kuebler Mar 23, 2018
ca26298
Removed typo.
carsten-kuebler Mar 23, 2018
e6b0e76
Correct Documentation
carsten-kuebler Mar 23, 2018
1335a83
Naming conventions
carsten-kuebler Mar 26, 2018
1e0ba34
Duplicated MeasurementState removed
carsten-kuebler Mar 26, 2018
74dd76d
Review
carsten-kuebler Mar 26, 2018
5d09b97
Review
carsten-kuebler Mar 26, 2018
8c7c946
All Identifier field names with postfix _id
carsten-kuebler Mar 27, 2018
d02b5a1
Rename EstimatedXXX messages to DetectedXXXData.
carsten-kuebler Mar 27, 2018
672deb8
More DetectedXXX messages unified
carsten-kuebler Mar 27, 2018
e33ab45
fixed merge conflicts with master
jdsika Mar 27, 2018
2e61c54
Merge branch 'master' into Documentation-Review3
jdsika Mar 27, 2018
179d4d8
removed tabs in osi_sensordata.proto
jdsika Mar 27, 2018
70d5b01
fixed merge conflict in osi_sensorview.proto
jdsika Mar 27, 2018
56d0c15
Fixed enum style, unknow=, other=, etc,
jdsika Mar 27, 2018
5d7725d
Reviewed Merge
carsten-kuebler Mar 27, 2018
a4fe010
Review...
carsten-kuebler Mar 27, 2018
27c9921
Reviewed...
carsten-kuebler Mar 27, 2018
e519f52
checked for plural forms and added notice for singular usage
jdsika Mar 27, 2018
8fc2004
Reviewed
carsten-kuebler Mar 27, 2018
6a6584c
removed tab and resolved merge conflict
jdsika Mar 27, 2018
d58011a
Merge branch 'Documentation-Review3' of https://github.com/OpenSimula…
jdsika Mar 27, 2018
7327dd7
Spaces and Tabs removed
carsten-kuebler Mar 27, 2018
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
190 changes: 113 additions & 77 deletions osi_common.proto

Large diffs are not rendered by default.

16 changes: 10 additions & 6 deletions osi_datarecording.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@ import "osi_sensordata.proto";
package osi;

//
// \brief (Time) Series of SensorData messages that may be used for data
// \brief (Time) Series of \c SensorData messages that may be used for data
// recording or internal buffering by some sensor models.
//
message SensorDataSeries
{
// List of sensor data messages for subsequent timesteps.
//
repeated SensorData sensor_data_list = 1;
// \note OSI uses singular instead of plural for repeated field names.
//
repeated SensorData sensor_data = 1;
}

//
// \brief List of SensorData interface copies, one for each sensor in the
// \brief List of \c SensorData interface copies, one for each sensor in the
// vehicle.
//
// Can be used to bundle output of multiple sensors in one transmission.
Expand All @@ -27,16 +29,18 @@ message SensorDataList
{
// List of sensor data for multiple sensors at a specific timestep.
//
repeated SensorData sensors = 1;
repeated SensorData sensor = 1;
}

//
// \brief List of sensors where each element contains a time series of
// SensorData messages.
// \c SensorData messages.
//
message SensorDataSeriesList
{
// List of sensor data for multiple sensors at subsequent timesteps.
//
repeated SensorDataSeries sensors = 1;
// \note OSI uses singular instead of plural for repeated field names.
//
repeated SensorDataSeries sensor = 1;
Copy link

Choose a reason for hiding this comment

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

sensor_data_series

The word series is both singular and plural. Same case as "data"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please note that you would adress
sensor_data_series (SensorDataSeriesList) --> sensor_data (SensorDataSeries) -> ...

often you find in OSI like:
sensor(s) (you get a message SensorDataSeries) -> data (you get a message SensorData) -> ...

}
Loading