Skip to content

Commit 6886d65

Browse files
pmaipmai
authored
Merge branch 'master' into feature/laneboundary_types
2 parents 005a850 + f7acd76 commit 6886d65

File tree

7 files changed

+338
-33
lines changed

7 files changed

+338
-33
lines changed

‎doc/architecture/trace_file_naming.adoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
The names of OSI trace files should have the following format:
66

7-
[source]
87
----
98
<timestamp>_<type>_<osi-version>_<protobuf-version>_<number-of-frames>_<custom-trace-name>.osi
109
----
@@ -54,7 +53,6 @@ Given an OSI trace file with the following information:
5453

5554
The recommended file name is:
5655

57-
[source]
5856
----
5957
20210818T150542Z_sv_312_300_1523_highway.osi
6058
----

‎doc/setup/installing_linux_cpp.adoc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,24 @@
1111
. Open a terminal.
1212
. Clone the Open Simulation repository.
1313
+
14-
[source]
1514
----
1615
git clone https://github.com/OpenSimulationInterface/open-simulation-interface.git
1716
----
1817
+
1918
. Switch to the repository directory.
2019
+
21-
[source]
2220
----
2321
cd open-simulation-interface
2422
----
2523
+
2624
. Create a new directory for the build.
2725
+
28-
[source]
2926
----
3027
mkdir build
3128
----
3229
+
3330
. Switch to the new directory.
3431
+
35-
[source]
3632
----
3733
cd build
3834
----
@@ -41,21 +37,18 @@ cd build
4137
To build a 32-bit target under 64-bit Linux, add `-DCMAKE_CXX_FLAGS="-m32"` to the cmake command.
4238
In this case, protobuf must be in 32-bit mode too.
4339
+
44-
[source]
4540
----
4641
cmake ..
4742
----
4843
+
4944
. Run make.
5045
+
51-
[source]
5246
----
5347
make
5448
----
5549
+
5650
. Install Open Simulation Interface.
5751
+
58-
[source]
5952
----
6053
sudo make install
6154
----

‎doc/setup/installing_linux_python.adoc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,24 @@
1212
. Open a terminal.
1313
. Clone the Open Simulation repository.
1414
+
15-
[source]
1615
----
1716
git clone https://github.com/OpenSimulationInterface/open-simulation-interface.git
1817
----
1918
+
2019
. Switch to the repository directory.
2120
+
22-
[source]
2321
----
2422
cd open-simulation-interface
2523
----
2624
+
2725
. Create a new virtual environment.
2826
+
29-
[source]
3027
----
3128
virtualenv -p python3 venv
3229
----
3330
+
3431
. Activate the virtual environment.
3532
+
36-
[source]
3733
----
3834
source venv/bin/activate
3935
----

‎doc/setup/installing_windows_cpp.adoc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,24 @@
1010
. Open a terminal as administrator.
1111
. Clone the Open Simulation repository.
1212
+
13-
[source]
1413
----
1514
git clone https://github.com/OpenSimulationInterface/open-simulation-interface.git
1615
----
1716
+
1817
. Switch to the repository directory.
1918
+
20-
[source]
2119
----
2220
cd open-simulation-interface
2321
----
2422
+
2523
. Create a new directory for the build.
2624
+
27-
[source]
2825
----
2926
mkdir build
3027
----
3128
+
3229
. Switch to the new directory.
3330
+
34-
[source]
3531
----
3632
cd build
3733
----
@@ -40,14 +36,12 @@ cd build
4036
To build a 64-bit target, add `Win64` to the generator name.
4137
In this case, protobuf and protoc.exe must be in 64-bit mode too.
4238
+
43-
[source]
4439
----
4540
cmake .. [-G <generator>] [-DCMAKE_INSTALL_PREFIX=<osi-install-directory>]
4641
----
4742
+
4843
. Build and install OSI.
4944
+
50-
[source]
5145
----
5246
cmake --build . [--config Release]
5347
cmake --build . --target install

‎doc/setup/installing_windows_python.adoc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,18 @@
1010
. Open a terminal.
1111
. Clone the Open Simulation repository.
1212
+
13-
[source]
1413
----
1514
git clone https://github.com/OpenSimulationInterface/open-simulation-interface.git
1615
----
1716
+
1817
. Switch to the repository directory.
1918
+
20-
[source]
2119
----
2220
cd open-simulation-interface
2321
----
2422
+
2523
. Run the setup script.
2624
+
27-
[source]
2825
----
2926
python setup.py install
3027
----

‎osi_common.proto‎

Lines changed: 86 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ package osi3;
1515
//
1616
message Vector3d
1717
{
18-
// The x coordinate.
18+
// The x-coordinate.
1919
//
2020
// Unit: m, m/s, or m/s^2
2121
//
2222
optional double x = 1;
2323

24-
// The y coordinate.
24+
// The y-coordinate.
2525
//
2626
// Unit: m, m/s, or m/s^2
2727
//
2828
optional double y = 2;
2929

30-
// The z coordinate.
30+
// The z-coordinate.
3131
//
3232
// Unit: m, m/s, or m/s^2
3333
//
@@ -43,13 +43,13 @@ message Vector3d
4343
//
4444
message Vector2d
4545
{
46-
// The x coordinate.
46+
// The x-coordinate.
4747
//
4848
// Unit: m, m/s, or m/s^2
4949
//
5050
optional double x = 1;
5151

52-
// The y coordinate.
52+
// The y-coordinate.
5353
//
5454
// Unit: m, m/s, or m/s^2
5555
//
@@ -804,3 +804,84 @@ message ColorCMYK
804804
//
805805
optional double key = 4;
806806
}
807+
808+
//
809+
// \brief A description for the positions of the pedals.
810+
//
811+
message Pedalry
812+
{
813+
// Position of the acceleration pedal.
814+
// Range: 0-1 (Unpressed - fully pressed)
815+
//
816+
optional double pedal_position_acceleration = 1;
817+
818+
// Position of the brake pedal.
819+
// Range: 0-1 (Unpressed - fully pressed)
820+
//
821+
optional double pedal_position_brake = 2;
822+
823+
// Position of the clutch pedal.
824+
// Range: 0-1 (Unpressed - fully pressed)
825+
//
826+
optional double pedal_position_clutch = 3;
827+
}
828+
829+
//
830+
// \brief A description of the steering wheel.
831+
//
832+
message VehicleSteeringWheel
833+
{
834+
// Angle of the steering wheel.
835+
// Zero means the steering wheel is in its center position. A positive value
836+
// means the steering wheel is turned to the left. A negative value
837+
// means the steering wheel is turned to the right of the center position.
838+
//
839+
// Unit: rad
840+
//
841+
optional double angle = 1;
842+
843+
// Angular speed of the steering wheel.
844+
// Zero means the steering wheel stays in its position. A positive value
845+
// means the steering wheel is turned to the left. A negative value
846+
// means the steering wheel is turned to the right.
847+
//
848+
// Unit: rad/s
849+
//
850+
optional double angular_speed = 2;
851+
852+
// Torque of the steering wheel to the hand.
853+
// Zero means there is no force from the steering wheel to the hand of the driver.
854+
// A positive value means that the steering wheel would turn to the left without driver intervention.
855+
// A negative value means that the steering wheel would turn to the right without driver intervention.
856+
//
857+
// Unit: N*m
858+
//
859+
optional double torque = 3;
860+
}
861+
862+
//
863+
// \brief The geodetic position of an object, that is, the center of the 3D bounding box.
864+
//
865+
message GeodeticPosition
866+
{
867+
// Longitude in decimal degrees regarding WGS84.
868+
//
869+
// Unit: Degree
870+
// Range: [-180; 180]
871+
//
872+
optional double longitude = 1;
873+
874+
// Latitude in decimal degrees regarding WGS84.
875+
//
876+
// Unit: Degree
877+
// Range: [-90; 90]
878+
//
879+
optional double latitude = 2;
880+
881+
// Height above sea level regarding EGM96.
882+
//
883+
// Unit: m
884+
// Range: [-300; 10000]
885+
//
886+
optional double altitude = 3;
887+
}

0 commit comments

Comments
 (0)