Commit cd4a2ed2 authored by Hendrik-Joern Guenther's avatar Hendrik-Joern Guenther
Browse files

Merged integration of Ignacio's MR and fixed unit

parents dc5d8d5c c5b40d08
Loading
Loading
Loading
Loading
+34 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ IMPORTS
/** @brief Include ETSI TS 102 894-2 v1.3.1
Include references from @url https://forge.etsi.org/rep/ITS/asn1/cdd_ts102894_2/blob/v1.3.1/ITS-Container.asn
*/
SpeedConfidence, VehicleWidth
SpeedConfidence, AccelerationConfidence, VehicleWidth
FROM ITS-Container {itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (2)}

/** @brief Include ISO 19091
@@ -227,6 +227,22 @@ SpeedExtended ::= SEQUENCE {
    confidence  SpeedConfidence
}

/** @brief Acceleration
A general Data Frame to describe an acceleration component along with a confidence with a predefined
confidence level of 95% for the component.
*/
Acceleration ::= SEQUENCE {
    /** @details value
    The acceleration value which can be estimated as the mean of the current distribution.
    */
    value       AccelerationValue,
    /** @details confidence
    The accuracy associated to the provided value at a predefined confidence level
    of 95% for the component.
    */
    confidence  AccelerationConfidence
}

/** @brief Sensor ID List
List of sensor IDs.
*/
@@ -320,6 +336,7 @@ ObjectClassWithConfidence ::= SEQUENCE {
The class that best describes the detected object. Each class provides optional subclasses.
*/
ObjectClass ::= CHOICE {

    vehicleSubclass     VehicleSubclassType,
    personSubclass      PersonSubclassType,
    animalSubclass      AnimalSubclassType,
@@ -350,6 +367,7 @@ NodeOffsetPointZ ::= CHOICE {
}



/** @brief Animal Subclass Type
Describes the subclass of a detected object for class animal.
@unit n/a
@@ -735,6 +753,19 @@ SpeedValueExtended ::= INTEGER {
    unavailable            (16383)  -- shall be set if information is not available
} (-16383..16383)

/** @brief Acceleration Value
Acceleration value for perceived object described in the reference frame of the disseminating ITS-S.
For a vehicle, the acceleration is reported in a body-fixed coordinate system as provided by ISO 8855.
For a RSU, the acceleration is reported in a coordinate system in which the y-axis corresponds to the
North direction, the x-axis to the East direction, and the z-axis to the vertical direction.
@unit 0,1 m/s2
*/
AccelerationValue ::= INTEGER {
    pointOneMeterPerSecSquared          (1),
    minusPointOneMeterPerSecSquared (-1),
    unavailable                                     (161)  -- shall be set if information is not available
} (-160 .. 161)

/** @brief Time of Measurement
Time difference with respect to the @see generationDeltaTime for the provided measurement for the
object. Negative values indicate that the provided object state refers to a point in time after
+8 −10
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ FROM ITS-Container {itu-t (0) identified-organization (4) etsi (0) itsDomain (5)

CartesianAngle, DynamicStatus, Identifier, MatchedPosition,
NumberOfPerceivedObjects, ObjectAge, ObjectConfidence, ObjectClassDescription, ObjectDimension,
ObjectDistance, ObjectRefPoint, SensorIdList, SpeedExtended, TimeOfMeasurement
ObjectDistance, ObjectRefPoint, SensorIdList, SpeedExtended, Acceleration, TimeOfMeasurement
FROM CPM-CommonDataTypes-Descriptions {itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (103324) commonDataTypes (2) version1 (1)};

/** @brief Perceived Object Container
@@ -105,11 +105,10 @@ PerceivedObject ::= SEQUENCE {
    /** @details xAcceleration
    Relative acceleration of the detected object from the ITS-S's reference point in x-direction
    for the time of measurement. For a vehicle, the acceleration is reported in a body-fixed
    coordinate system as provided by ISO 8855. For a RSU, the acceleration is reported in a
    coordinate system in which the y-axis corresponds to the North direction, the x-axis to the
    East direction, and the z-axis to the vertical direction.
    coordinate system as provided by ISO 8855. For a RSU, the acceleration x-axis corresponds to
    the East direction.
    */
    xAcceleration           LongitudinalAcceleration OPTIONAL,
    xAcceleration           Acceleration OPTIONAL,
    /** @details yAcceleration
    Relative acceleration of the detected object from the ITS-S's reference point in y-direction
    for the time of measurement. For a vehicle, the acceleration is reported in a body-fixed
@@ -121,11 +120,10 @@ PerceivedObject ::= SEQUENCE {
    /** @details zAcceleration
    Relative acceleration of the detected object from the ITS-S's reference point in z-direction
    for the time of measurement. For a vehicle, the acceleration is reported in a body-fixed
    coordinate system as provided by ISO 8855. For a RSU, the acceleration is reported in a
    coordinate system in which the y-axis corresponds to the North direction, the x-axis to the
    East direction, and the z-axis to the vertical direction.
    coordinate system as provided by ISO 8855. For a RSU, the acceleration z-axis corresponds to
    the vertical direction.
    */
    zAcceleration           VerticalAcceleration OPTIONAL,
    zAcceleration           Acceleration OPTIONAL,
    /** @details yawAngle
    Relative yaw angle of object from the ITS-S's reference point. For a vehicle, the angle is
    reported in a body-fixed coordinate system as provided by ISO 8855. For a RSU, the angle is