Commit 067d50d0 authored by William Whyte's avatar William Whyte
Browse files

Updated per Jasja and Bosch comments

parent 86deabe5
Loading
Loading
Loading
Loading
+22 −16
Original line number Original line Diff line number Diff line
-- ETSI TS 103 300-3 V0.4.0 (2020-07)
-- ETSI TS 103 300-3 V0.4.0 (2020-07)


VAM-PDU-Descriptions {itu-t(0) identified-organization(4) etsi(0) itsDomain(5)
VAM-PDU-Descriptions {itu-t(0) identified-organization(4) etsi(0) itsDomain(5)
    wg1(1) ts(103300) part-3 (3) vam(1) version(1)}
    wg1(1) ts(103300) vam(1) version1(1)}
DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
BEGIN


@@ -26,7 +26,7 @@ BEGIN


    AreaCircular, AreaPolygon, AreaRectangle, BasicContainer, ItsPduHeader
    AreaCircular, AreaPolygon, AreaRectangle, BasicContainer, ItsPduHeader
    FROM VAM-Temp-Imports {itu-t(0) identified-organization(4) etsi(0) 
    FROM VAM-Temp-Imports {itu-t(0) identified-organization(4) etsi(0) 
        itsDomain(5) wg1(1) ts(103300) part-3(3) temp-imports(255) version(1)}
        itsDomain(5) wg1(1) ts(103300) temp-imports(255) version1(1)}
        WITH SUCCESSORS
        WITH SUCCESSORS


    IntersectionReferenceID, LaneID 
    IntersectionReferenceID, LaneID 
@@ -100,7 +100,8 @@ BEGIN


    TrafficIslandPosition ::= SEQUENCE {
    TrafficIslandPosition ::= SEQUENCE {
        oneSide    NonIslandLanePosition,
        oneSide    NonIslandLanePosition,
        otherSide  NonIslandLanePosition
        otherSide  NonIslandLanePosition,
        ...
    }
    }
  
  
    NonIslandLanePosition ::= CHOICE {
    NonIslandLanePosition ::= CHOICE {
@@ -123,8 +124,9 @@ BEGIN


    VruMovementControl ::= ENUMERATED {
    VruMovementControl ::= ENUMERATED {
        unavailable (0), braking(1), hardBraking(2), stopPedaling (3),
        unavailable (0), braking(1), hardBraking(2), stopPedaling (3),
        noReaction(4), max (255)
        brakingAndStopPedaling(4), hardBrakingAndStopPedaling (5), 
        -- values 5-254 reserved for later use
        noReaction(6),   max (255)
        -- values 7-254 reserved for later use
    }
    }


    VruOrientation ::= Heading -- from ITS-Container
    VruOrientation ::= Heading -- from ITS-Container
@@ -270,7 +272,7 @@ BEGIN
        pathHistory                      PathHistory OPTIONAL,
        pathHistory                      PathHistory OPTIONAL,
        pathPrediction                   PathPrediction OPTIONAL,
        pathPrediction                   PathPrediction OPTIONAL,
        safeDistance                     SequenceOfVruSafeDistanceIndication OPTIONAL,
        safeDistance                     SequenceOfVruSafeDistanceIndication OPTIONAL,
        trajectoryChangeIndication     SequenceOfTrajectoryInterceptionIndication OPTIONAL,
        trajectoryInterceptionIndication SequenceOfTrajectoryInterceptionIndication OPTIONAL,
        accelerationChangeIndication     AccelerationChangeIndication OPTIONAL,
        accelerationChangeIndication     AccelerationChangeIndication OPTIONAL,
        headingChangeIndication          HeadingChangeIndication OPTIONAL,
        headingChangeIndication          HeadingChangeIndication OPTIONAL,
        stabilityChangeIndication        StabilityChangeIndication OPTIONAL,
        stabilityChangeIndication        StabilityChangeIndication OPTIONAL,
@@ -294,12 +296,14 @@ BEGIN


    TrajectoryInterceptionIndication  ::= SEQUENCE {
    TrajectoryInterceptionIndication  ::= SEQUENCE {
        subjectStation                    StationID OPTIONAL, 
        subjectStation                    StationID OPTIONAL, 
        trajectoryInterceptionIndication  BOOLEAN 
        trajectoryInterceptionIndication  BOOLEAN,
        ... 
    }
    }


    HeadingChangeIndication ::= SEQUENCE {
    HeadingChangeIndication ::= SEQUENCE {
        direction        LeftOrRight,
        direction        LeftOrRight,
        actionDeltaTime  ActionDeltaTime
        actionDeltaTime  ActionDeltaTime,
        ...
    }
    }


    LeftOrRight ::= ENUMERATED { left, right }
    LeftOrRight ::= ENUMERATED { left, right }
@@ -309,14 +313,16 @@ BEGIN


    AccelerationChangeIndication ::= SEQUENCE {
    AccelerationChangeIndication ::= SEQUENCE {
         accelOrDecel    AccelOrDecel,
         accelOrDecel    AccelOrDecel,
         actionDeltaTime ActionDeltaTime
         actionDeltaTime ActionDeltaTime,
         ...
    }
    }


    AccelOrDecel ::= ENUMERATED { accelerate, decelerate }
    AccelOrDecel ::= ENUMERATED { accelerate, decelerate }
 
 
    StabilityChangeIndication ::= SEQUENCE {
    StabilityChangeIndication ::= SEQUENCE {
       lossProbability     StabilityLossProbability,
       lossProbability     StabilityLossProbability,
       actionDeltaTime     ActionDeltaTime
       actionDeltaTime     ActionDeltaTime,
       ...
    } 
    } 


    StabilityLossProbability ::= INTEGER { zero(0), twoPercent (1),
    StabilityLossProbability ::= INTEGER { zero(0), twoPercent (1),
+2 −18
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@
-- version number of this module will be incremented.
-- version number of this module will be incremented.


VAM-Temp-Imports {itu-t(0) identified-organization(4) etsi(0) itsDomain(5)
VAM-Temp-Imports {itu-t(0) identified-organization(4) etsi(0) itsDomain(5)
    wg1(1) ts(103300) part-3(3) temp-imports(255) version(1)}
    wg1(1) ts(103300) temp-imports(255) version1(1)}


DEFINITIONS AUTOMATIC TAGS ::=
DEFINITIONS AUTOMATIC TAGS ::=


@@ -14,7 +14,7 @@ BEGIN


IMPORTS
IMPORTS


ReferencePosition, SpeedConfidence, StationID, VehicleWidth
ReferencePosition, StationID
FROM ITS-Container 
FROM ITS-Container 
  {itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) 
  {itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) 
   ts (102894) cdd (2) version (2)}
   ts (102894) cdd (2) version (2)}
@@ -89,11 +89,6 @@ SemiRangeLength ::= INTEGER {
    oneMeter            (10)
    oneMeter            (10)
} (0..10000)
} (0..10000)


WGS84Angle ::= SEQUENCE {
    value       WGS84AngleValue,
    confidence  AngleConfidence
}

WGS84AngleValue ::= INTEGER {
WGS84AngleValue ::= INTEGER {
    wgs84North          (0),
    wgs84North          (0),
    wgs84East           (900),
    wgs84East           (900),
@@ -102,17 +97,6 @@ WGS84AngleValue ::= INTEGER {
    unavailable         (3601)
    unavailable         (3601)
} (0..3601)
} (0..3601)


AngleConfidence ::= INTEGER {
    zeroPointOneDegree  (1),    -- if the heading accuracy is equal to or less than 0,1 degree
    oneDegree           (10),
    outOfRange          (126),  -- if the heading accuracy is out of range, i.e. greater than
                                -- 12,5 degrees. A corresponding reported angle value shall be
                                -- considered invalid and cannot be trusted.
    unavailable         (127)   -- if the heading accuracy information is not available
} (1..127)



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), 
+2 −2
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@
-- Cooperative Awareness Message (CAM) defined in EN 302 637-2
-- Cooperative Awareness Message (CAM) defined in EN 302 637-2


VRU-Motorcyclist-Special-Container {itu-t(0) identified-organization(4) etsi(0) itsDomain(5)
VRU-Motorcyclist-Special-Container {itu-t(0) identified-organization(4) etsi(0) itsDomain(5)
    wg1(1) ts(103300) motorcyclist-special-container(2) version(1)}
    wg1(1) ts(103300) motorcyclist-special-container(2) version1(1)}




DEFINITIONS AUTOMATIC TAGS ::= 
DEFINITIONS AUTOMATIC TAGS ::= 
@@ -15,7 +15,7 @@ IMPORTS
    VruSizeClass, VruSubProfileMotorcyclist
    VruSizeClass, VruSubProfileMotorcyclist
FROM VAM-PDU-Descriptions 
FROM VAM-PDU-Descriptions 
    {itu-t(0) identified-organization(4) etsi(0) itsDomain(5)
    {itu-t(0) identified-organization(4) etsi(0) itsDomain(5)
     wg1(1) ts(103300) part-3(3) vam(1) version(1)}
     wg1(1) ts(103300) vam(1) version1(1)}


    PathHistory
    PathHistory
FROM ITS-Container 
FROM ITS-Container