updated idl to reflect current API

Change-Id: I9c6a2c25d3ecc1876ba52ee7bc37822d51e9a93d

diff --git a/src/Vehicle/Vehicle.idl b/src/Vehicle/Vehicle.idl
index 75e5435..3cea747 100644 (file)
--- a/src/Vehicle/Vehicle.idl
+++ b/src/Vehicle/Vehicle.idl
@@ -454,12 +454,6 @@ interface HVAC : VehiclePropertyType  {
         **/
        attribute boolean heater;
 
-       /**  Defrost
-        *   \brief Must return the defrost status of all windows equiped with defrosters.  This will return a dictionary of DefrostDictionary that represents    
-        *   \brief each window and its defrost status.    
-        **/
-       attribute DefrostDictionary defrost;
-
        /**  SteeringWheelHeater
         *   \brief Must return air recirculation on (true) / off (false).    
         **/
@@ -484,11 +478,16 @@ interface WindowStatus : VehiclePropertyType  {
        const unsigned short WINDOWLOCATION_RIGHTREAR = 3;    
        const unsigned short WINDOWLOCATION_REAR = 4;    
 
-       /**  WindowStatus
-        *   \brief Must return window status for each window location.  object returned is a    
-        *   dictionary { unsigned short windowlocation, unsigned short percentage opened }    
+       /**  openness
+        *   \brief Must return window openness percentage (100% fully open, 0% fully closed)
+        *  for the window location see "zone" attribute
         **/
-       attribute object WindowStatus;
+       attribute unsigned short openness;
+
+       /**  defrost
+       *   \brief Must return the defroster status of the window. On = true, Off = false.
+       **/
+       attribute boolean defrost;
 };
 
 [NoInterfaceObject]
@@ -788,43 +787,32 @@ interface VehicleTopSpeedLimit : VehiclePropertyType  {
 };
 
 [NoInterfaceObject]
-interface AirbagStatus : VehiclePropertyType  { 
-       const unsigned short AIRBAGLOCATION_DRIVER = 0;    
-       const unsigned short AIRBAGLOCATION_PASSENGER= 1;    
-       const unsigned short AIRBAGLOCATION_LEFTSIDE = 2;    
-       const unsigned short AIRBAGLOCATION_RIGHTSIDE = 3;    
+interface AirbagStatus : VehiclePropertyType  {
        const unsigned short AIRBAGSTATUS_INACTIVE = 0;    
        const unsigned short AIRBAGSTATUS_ACTIVE = 1;    
        const unsigned short AIRBAGSTATUS_DEPLOYED = 2;    
 
        /**  AirbagStatus
-        *   \brief MUST returns a dictionary of Airbag (byte) and Status (byte) (see 
+        *   \brief MUST return Airbag deployment status (see AIRBAGSTATUS*)
         **/
-        attribute object airbagStatus;
+        attribute unsigned short airbagStatus;
 };
 
 [NoInterfaceObject]
 interface DoorStatus : VehiclePropertyType  { 
-       const unsigned short DOORLOCATION_DRIVER= 0;    
-       const unsigned short DOORLOCATION_PASSENGER = 1;    
-       const unsigned short DOORLOCATION_LEFTREAR = 2;    
-       const unsigned short DOORLOCATION_RIGHTREAR = 3;    
-       const unsigned short DOORLOCATION_TRUNK = 4;    
-       const unsigned short DOORLOCATION_FUELCAP = 5;    
-       const unsigned short DOORLOCATION_HOOD = 6;    
        const unsigned short DOORSTATUS_CLOSED = 0;    
        const unsigned short DOORSTATUS_OPEN = 1;    
        const unsigned short DOORSTATUS_AJAR = 2;    
 
-       /**  DoorStatus
-        *   \brief MUST returns dictionary of Door (byte) and Status (byte).  See 
+        /**  DoorStatus
+        *   \brief MUST returns Door status (byte).  See DOORSTATUS_*
         **/
-        attribute object doorStatus;
+        attribute unsigned short doorStatus;
 
        /**  DoorLockStatus
-        *   \brief MUST returns dictionary of Door (byte) and Status (bool locked = true, unlocked = false).  See 
+        *   \brief MUST returns Door status (bool locked = true, unlocked = false).
         **/
-        attribute object doorLockStatus;
+        attribute boolean doorLockStatus;
 
        /**  ChildLockStatus
         *   \brief MUST returns Child lock status of rear doors.  active = true, inactive = false.    
@@ -836,35 +824,23 @@ interface DoorStatus : VehiclePropertyType  {
 
 [NoInterfaceObject]
 interface SeatBeltStatus : VehiclePropertyType  { 
-       const unsigned short SEATBELTLOCATION_DRIVER= 0;    
-       const unsigned short SEATBELTLOCATION_MIDDLEFRONT = 1;    
-       const unsigned short SEATBELTLOCATION_PASSENGER = 2;    
-       const unsigned short SEATBELTLOCATION_LEFTREAR = 3;    
-       const unsigned short SEATBELTLOCATION_MIDDLEREAR = 4;    
-       const unsigned short SEATBELTLOCATION_RIGHTREAR = 5;    
 
        /**  SeatBeltStatus
-        *   \brief MUST returns dictionary of Seat Belt (byte, see SEATBELTLOCATION) and Status (bool: Fasten = true, Unfastened = false)    
+        *   \brief MUST return Seat Belt status (bool: Fasten = true, Unfastened = false)
         **/
-        attribute object seatBeltStatus;
+        attribute boolean seatBeltStatus;
 };
 
 [NoInterfaceObject]
-interface OccupantStatus : VehiclePropertyType  { 
-       const unsigned short OCCUPANTLOCATION_DRIVER = 0;    
-       const unsigned short OCCUPANTLOCATION_FRONTMIDDLE = 1;    
-       const unsigned short OCCUPANTLOCATION_PASSENGER= 2;    
-       const unsigned short OCCUPANTLOCATION_LEFTREAR = 3;    
-       const unsigned short OCCUPANTLOCATION_MIDDLEREAR = 4;    
-       const unsigned short OCCUPANTLOCATION_RIGHTREAR = 5;    
+interface OccupantStatus : VehiclePropertyType  {
        const unsigned short OCCUPANTSTATUS_VACANT = 0;    
        const unsigned short OCCUPANTSTATUS_CHILD = 1;    
        const unsigned short OCCUPANTSTATUS_ADULT = 2;    
 
        /**  OccupantStatus
-        *   \brief MUST returns dictionary of Occupant (byte see OCCUPANTLOCATION) and Status (byte, see 
+        *   \brief MUST returns Occupant status (byte, see OCCUPANTSTATUS)
         **/
-        attribute object occupantStatus;
+        attribute unsigned short occupantStatus;
 };
 
 [NoInterfaceObject]
@@ -877,7 +853,26 @@ interface ObstacleDistance : VehiclePropertyType  {
        const unsigned short DISTANCESENSORLOCATION_RIGHTBLINDSPOT = 5;    
 
        /**  ObstacleDistance
-        *   \brief MUST returns dictionary of Distance Sensor (byte, see DISTANCESENSORLOCATION) and distance (double) in m.    
+        *   \brief MUST returns Distance Sensor distance (Double) in m.
         **/
-        attribute object obstacleDistance;
+        attribute double obstacleDistance;
+};
+
+[NoInterfaceObject]
+interface NightMode : VehiclePropertyType {
+
+       /*!
+       * \brief MUST return whether or not the system is in NightMode or not.  True = Night time, False = Day time
+       **/
+       attribute boolean nightMode;
 };
+
+[NoInterfaceObject]
+interface DrivingMode : VehiclePropertyType {
+
+       /**
+       * \brief MUST return whether or not the system is in DrivingMode or not.  1 = Driving, 0 = Not Driving
+       **/
+       attribute unsigned short drivingMode;
+};
+