Commit 8cb29c64 authored by William Whyte's avatar William Whyte
Browse files

Final changes for v2.1.1

parent bb7f0ac4
Loading
Loading
Loading
Loading
+11 −8
Original line number Diff line number Diff line
@@ -173,13 +173,12 @@ BEGIN
    }

    VruSubProfileAnimal ::= ENUMERATED {
      unavailable(0), max(15)
      unavailable(0), wild-animal(1), farm-animal(2), service-animal(3),   max(15)
    }

    VruExteriorLights ::= SEQUENCE {
        vruSpecific     VruSpecificExteriorLights, -- defined below
        generic         ExteriorLights
        -- should be extensible?
        vehicular         ExteriorLights
    }

    VruSpecificExteriorLights ::= BIT STRING {
@@ -199,7 +198,7 @@ BEGIN
    VruClusterInformationContainer ::= SEQUENCE {
        clusterId                     ClusterId,
        clusterBoundingBoxShape       ClusterBoundingBoxShape,
        clusterCardinalitySize        INTEGER(0..255), -- 0 means unknown
        clusterCardinalitySize        ClusterCardinalitySize, -- 0 means unknown
        clusterProfiles               ClusterProfiles,
        ...
    }
@@ -213,6 +212,8 @@ BEGIN
        ...
    }

    ClusterCardinalitySize   ::= INTEGER {unavailable(0), onlyLeader(1)} (0..255) 

    ClusterProfiles ::= BIT STRING {
        pedestrian(0),
        bicyclist(1),
@@ -293,15 +294,17 @@ BEGIN


    SequenceOfVruSafeDistanceIndication ::= 
        SEQUENCE(SIZE(0..8)) OF VruSafeDistanceIndication
        SEQUENCE(SIZE(1..8)) OF VruSafeDistanceIndication

    VruSafeDistanceIndication ::= SEQUENCE {
        subjectStation                 StationID OPTIONAL,
        stationSafeDistanceIndication  BOOLEAN,
        stationSafeDistanceIndication  StationSafeDistanceIndication,
        timeToCollision                ActionDeltaTime OPTIONAL,
        ...
    }

    StationSafeDistanceIndication ::= BOOLEAN

    SequenceOfTrajectoryInterceptionIndication ::= 
        SEQUENCE (SIZE(1..8)) OF TrajectoryInterceptionIndication