Commit bb7f0ac4 authored by William Whyte's avatar William Whyte
Browse files

Final changes to make consistent with v0.5.0

parent ad6ae128

VAM-PDU-Descriptions.asn

+5 −5
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ BEGIN 
    Curvature, CurvatureCalculationMode, ExteriorLights, Heading,

    Curvature, CurvatureCalculationMode, ExteriorLights, Heading,

    LanePosition, LateralAcceleration, LongitudinalAcceleration, 

    LanePosition, LateralAcceleration, LongitudinalAcceleration, 

    PathDeltaTime, PathHistory, ReferencePosition, Speed,

    PathDeltaTime, PathHistory, ReferencePosition, Speed,

    StationID, SteeringWheelAngle, VerticalAcceleration, YawRate

    StationID, VerticalAcceleration, YawRate

    FROM ITS-Container {itu-t(0) identified-organization(4) etsi(0)

    FROM ITS-Container {itu-t(0) identified-organization(4) etsi(0)

        itsDomain(5) wg1(1) ts(102894) cdd(2) version(2)}

        itsDomain(5) wg1(1) ts(102894) cdd(2) version(2)}
@@ -226,7 +226,7 @@ BEGIN 
        clusterJoinInfo         ClusterJoinInfo OPTIONAL,

        clusterJoinInfo         ClusterJoinInfo OPTIONAL,

        clusterLeaveInfo        ClusterLeaveInfo OPTIONAL,

        clusterLeaveInfo        ClusterLeaveInfo OPTIONAL,

        clusterBreakupInfo      ClusterBreakupInfo OPTIONAL,

        clusterBreakupInfo      ClusterBreakupInfo OPTIONAL,

        clusterIdChangeInfo VruClusterOpTimestamp OPTIONAL,

        clusterIdChangeTimeInfo VruClusterOpTimestamp OPTIONAL,

        ...

        ...

    }

    }

VAM-Temp-Imports.asn

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ WGS84AngleValue ::= INTEGER { 
StationType ::= INTEGER {

StationType ::= INTEGER {

    unknown(0), pedestrian(1), cyclist(2), moped(3), motorcycle(4),

    unknown(0), pedestrian(1), cyclist(2), moped(3), motorcycle(4),

    passengerCar(5), bus(6), lightTruck(7), heavyTruck(8), trailer(9), 

    passengerCar(5), bus(6), lightTruck(7), heavyTruck(8), trailer(9), 

    specialVehicles(10), tram(11), lightVruVehicle(12), animals(13), 

    specialVehicles(10), tram(11), lightVruVehicle(12), animal(13), 

    roadSideUnit(15)

    roadSideUnit(15)

}

}

(0..255)

(0..255)

motorcyclist-special-container.asn

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ MotorcylistSpecialContainer ::= SEQUENCE { 
   rollAngle                   VruRollAngle OPTIONAL, 

   rollAngle                   VruRollAngle OPTIONAL, 

   orientation                 VruOrientation OPTIONAL,

   orientation                 VruOrientation OPTIONAL,

   vruSafeDistance             SequenceOfVruSafeDistanceIndication OPTIONAL,

   vruSafeDistance             SequenceOfVruSafeDistanceIndication OPTIONAL,

   pathHistory                 PathHistory OPTIONAL,

   pathPrediction              SequenceOfVruPathPoint OPTIONAL,

   pathPrediction              SequenceOfVruPathPoint OPTIONAL,

   stabilityChangeIndication   StabilityChangeIndication OPTIONAL,

   stabilityChangeIndication   StabilityChangeIndication OPTIONAL,

   ...

   ...