Separate Occupant branch

Signed-off-by: Erik Jaegervall <[email protected]>

spec/Cabin/Seat/Occupant.vspec

@@ -11,16 +11,18 @@
 #
 
 Identifier:
+  deprecation: v5.0 - use data from Vehicle.Occupant.*.*.Identifier.
   type: branch
   description: Identifier attributes based on OAuth 2.0.
-#include Occupant/Identifier.vspec Identifier
 
-HeadPosition:
-  type: branch
-  description: The current position of the driver head on vehicle axis according to ISO 23150:2023.
-#include Occupant/HeadPosition.vspec HeadPosition
+Identifier.Subject:
+  deprecation: v5.0 - use data from Vehicle.Occupant.*.*.Identifier.
+  datatype: string
+  type: sensor
+  description: Subject for the authentication of the occupant e.g. UserID 7331677.
 
-MidEyeGaze:
-  type: branch
-  description: Direction from mid eye position to object driver is looking at.
-#include Occupant/MidEyeGaze.vspec MidEyeGaze
+Identifier.Issuer:
+  deprecation: v5.0 - use data from Vehicle.Occupant.*.*.Identifier.
+  datatype: string
+  type: sensor
+  description: Unique Issuer for the authentication of the occupant e.g. https://accounts.funcorp.com.

spec/Driver/Driver.vspec

@@ -10,20 +10,19 @@
 # Driver data
 #
 
-
 Identifier:
-  deprecation: v5.0 - use data from Vehicle.Cabin.Seat.*.*.Occupant.Identifier.
+  deprecation: v5.0 - use data from Vehicle.Occupant.*.*.Identifier.
   type: branch
   description: Identifier attributes based on OAuth 2.0.
 
 Identifier.Subject:
-  deprecation: v5.0 - use data from Vehicle.Cabin.Seat.*.*.Occupant.Identifier.
+  deprecation: v5.0 - use data from Vehicle.Occupant.*.*.Identifier.
   datatype: string
   type: sensor
   description: Subject for the authentication of the occupant e.g. UserID 7331677.
 
 Identifier.Issuer:
-  deprecation: v5.0 - use data from Vehicle.Cabin.Seat.*.*.Occupant.Identifier.
+  deprecation: v5.0 - use data from Vehicle.Occupant.*.*.Identifier.
   datatype: string
   type: sensor
   description: Unique Issuer for the authentication of the occupant e.g. https://accounts.funcorp.com.

spec/Vehicle/Occupant.vspec

@@ -0,0 +1,26 @@
+# Copyright (c) 2020 Contributors to COVESA
+#
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
+#
+# SPDX-License-Identifier: MPL-2.0
+
+#
+# Occupant data
+#
+
+Identifier:
+  type: branch
+  description: Identifier attributes based on OAuth 2.0.
+#include ../include/Identifier.vspec Identifier
+
+HeadPosition:
+  type: branch
+  description: The current position of the driver head on vehicle axis according to ISO 23150:2023.
+#include Occupant/HeadPosition.vspec HeadPosition
+
+MidEyeGaze:
+  type: branch
+  description: Direction from mid eye position to object driver is looking at.
+#include Occupant/MidEyeGaze.vspec MidEyeGaze

spec/Cabin/Seat/Occupant/HeadPosition.vspec → spec/Vehicle/Occupant/HeadPosition.vspec

@@ -26,7 +26,7 @@
 # Head axis system is defined as follows
 # Head X-axis corresponds to a vector from midway between left and right pre-auricular point and nasion.
 # Head Y-axis corresponds to a vector orthogonal to X going left from the head on the plane defined by left and right
-# pre-auricular point and nasion
+# pre-auricular point and nasion.
 # Head Z-axis corresponds to vector orthogonal to X and Y going upward.
 #
 

spec/VehicleSignalSpecification.vspec

@@ -166,6 +166,17 @@ Vehicle.Driver:
 
 #include Driver/Driver.vspec Vehicle.Driver
 
+#
+# Occupant Data
+#
+
+Vehicle.Occupant:
+  type: branch
+  instances:
+    - Row[1,2]
+    - ["DriverSide","Middle","PassengerSide"]
+  description: Occupant (Driver or Passenger) data.
+#include Vehicle/Occupant.vspec Vehicle.Occupant
 
 #
 # Exterior information