added driving mode and documented it and night mode in idl

diff --git a/docs/amb.idl b/docs/amb.idl
index e3760da..50c8ffa 100644 (file)
--- a/docs/amb.idl
+++ b/docs/amb.idl
@@ -48,6 +48,7 @@ interface VehiclePropertyType {
        **/
        Dictionary getHistory(double beginTime, double endTime);
 }
+
 enum Zone {
        None = 0,
        Front = 1,
@@ -57,34 +58,35 @@ enum Zone {
        Rear = 1 << 4,
        Center = 1 << 5
 }
+
 [NoInterfaceObject]
 interface Manager  {
 
        /**  
         *  \brief returns supported properties
        **/
-       sequence<DOMString> list();
+       sequence<DOMString> List();
        /**  
         *  \brief find the DBus object path which matches "objectName" and "zone".
         *  \arg DOMString property is the requested property to be retrieved.
         *  \arg Zone zone is the zone which the object
         *  \returns string representing the DBus Object path
        **/
-       DOMString findObjectForZone(DOMString objectName, Zone zone);
+       DOMString FindObjectForZone(DOMString objectName, Zone zone);
        
        /**  
         *  \brief find the DBus object path matching the given "objectName"
         *  \arg DOMString objectName to find
         *  \returns list of object paths that provide the given object Name.
        **/
-       sequence<DOMString> findObject(DOMString objectName)
+       sequence<DOMString> FindObject(DOMString objectName)
         
        /**  
         *  \brief get a list of zones for a given objectName.
         *  \arg DOMString objectName object name.
         *  \returns list of zones for the given objectName (@see Zone)
        **/
-       sequence<unsigned short> zonesForObjectName(DOMString objectName)
+       sequence<unsigned short> ZonesForObjectName(DOMString objectName)
 };
 
 [NoInterfaceObject]
@@ -861,5 +863,23 @@ interface ObstacleDistance : VehiclePropertyType  {
        readonly attribute object ObstacleDistance;
 };
 
+[NoInterfaceObject]
+interface NightMode : VehiclePropertyType {
+       
+       /*!
+        * \brief MUST return whether or not the system is in NightMode or not.  True = Night time, False = Day time
+        **/
+       readonly 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
+         **/
+        readonly attribute unsigned short DrivingMode;   
+};
+
 };
 

diff --git a/lib/vehicleproperty.cpp b/lib/vehicleproperty.cpp
index 8a8085c..3ab20c0 100644 (file)
--- a/lib/vehicleproperty.cpp
+++ b/lib/vehicleproperty.cpp
@@ -147,7 +147,7 @@ const VehicleProperty::Property VehicleProperty::Sunroof = "Sunroof";
 const VehicleProperty::Property VehicleProperty::SunroofTilt = "SunroofTilt";
 const VehicleProperty::Property VehicleProperty::ConvertibleRoof = "ConvertibleRoof";
 const VehicleProperty::Property VehicleProperty::NightMode = "NightMode";
-
+const VehicleProperty::Property VehicleProperty::DrivingMode = "DrivingMode";
 
 std::list<VehicleProperty::Property> VehicleProperty::mCapabilities;
 std::list<VehicleProperty::Property> VehicleProperty::mCustomProperties;
@@ -328,6 +328,7 @@ VehicleProperty::VehicleProperty()
        REGISTERPROPERTY(SunroofTilt,0);
        REGISTERPROPERTY(ConvertibleRoof,false);
        REGISTERPROPERTY(NightMode,false);
+       REGISTERPROPERTY(DrivingMode,Driving::None);
 
 }
 

diff --git a/lib/vehicleproperty.h b/lib/vehicleproperty.h
index 00bbaa2..531f03f 100644 (file)
--- a/lib/vehicleproperty.h
+++ b/lib/vehicleproperty.h
@@ -257,6 +257,15 @@ enum AirflowDirection
 };
 }
 
+namespace Driving
+{
+enum Mode
+{
+       None = 0,
+       Driving
+};
+}
+
 #include <boost/preprocessor/comma.hpp>
 
 #define PROPERTYTYPE(property, propertyType, baseClass, valueType) \
@@ -768,6 +777,9 @@ public:
        static const Property NightMode;
        PROPERTYTYPEBASIC(NightMode, bool)
 
+       static const Property DrivingMode;
+       PROPERTYTYPEBASIC(DrivingMode, Driving::Mode)
+
        /** END PROPERTIES **/