Commit 36a7fffd authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing merge conflict

parents 16fb7f3d 612c3102
Loading
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -157,6 +157,19 @@
            },
            "required" : []
        },
        "VINtoConnectedDevicesRecord" : {
            "type" : "object",
            "properties" : {
                "ConnectionType" : { "$ref" : "ts_103120_Common_2016_02#/$defs/DictionaryEntry"},
                "DeviceIdentifiers" : { "$ref" : "#/$defs/ListOfCommsIDs"},
                "ConnectionTime" : { "$ref" : "#/$defs/AssociationTime" }
            },
            "required" : ["ConnectionTime"]
        },
        "ListOfCommsIDs" : {
            "type" : "array",
            "items" : "#/$defs/CommsID"
        },
        "ResultRecords" : {
            "type" : "object",
            "properties" : {
+26 −0
Original line number Diff line number Diff line
@@ -80,4 +80,30 @@
            </DictionaryEntry>
        </DictionaryEntries>
    </Dictionary>   
    <Dictionary>
        <Owner>ETSI</Owner>
        <Name>TS103976ConnectionType</Name>
        <DictionaryEntries>
            <DictionaryEntry>
                <Value>Infotainment</Value>
                <Meaning>A device which is connected to the vehicle either via a cable (e.g. via USB) or wirelessly (e.g. via Bluetooth) in order to allow features from the device (e.g. navigation, calls, music) to be displayed on the vehicle or accessed through the vehicle. Typically used when the device is in the vehicle.</Meaning>
            </DictionaryEntry>
            <DictionaryEntry>
                <Value>RemoteAccess</Value>
                <Meaning>A device which is connected to the vehicle (typically wirelessly) in order to access data from the vehicle or to remotely engage functions on the vehicle. Typically used when the device is not in the vehicle.</Meaning>
            </DictionaryEntry>
            <DictionaryEntry>
                <Value>KeyPairing</Value>
                <Meaning>Device is authorized to be used for gaining entry to the vehicle or to facilitate starting the vehicle, or both. This connection type is used to indicate that the device has the capability to assist with entry to the vehicle or starting the vehicle.</Meaning>
            </DictionaryEntry>
            <DictionaryEntry>
                <Value>KeyUse</Value>
                <Meaning>The use of a device to gain entry to the vehicle or to start the vehicle.</Meaning>
            </DictionaryEntry>
            <DictionaryEntry>
                <Value>WLAN</Value>
                <Meaning>Device that is using the car as a Wireless Local Area Network hot spot.</Meaning>
            </DictionaryEntry>
        </DictionaryEntries>
    </Dictionary>
</Dictionaries>