added fuel economy property

diff --git a/docs/electricvehicle.txt b/docs/electricvehicle.txt
index 18939a4..d9c2fee 100644 (file)
--- a/docs/electricvehicle.txt
+++ b/docs/electricvehicle.txt
@@ -7,29 +7,29 @@ Object path     /
 
 Properties             byte HybridPowerSystem [readonly]
 
-                                       Hybrid power system:
-                                       
-                                       Idle = 0,
-                                       Battery Mode = 1,
-                                       Engine Mode = 2,
-                                       Hybrid Mode = 3
-                                       
-                               bool ChargingStatus [readwrite]
+                               Hybrid power system:
                                
-                                       get or sets charging status: on = true, off = false.
-                                       
-                               struct{ double, byte } BatteryVoltage [readonly]
+                               Idle = 0,
+                               Battery Mode = 1,
+                               Engine Mode = 2,
+                               Hybrid Mode = 3
                                
-                                       Voltage of battery (double) and Level of charge (0-100%) (byte).
-                                       
-                               bool BatteryChargeCord [readonly]
+                       bool ChargingStatus [readwrite]
+                       
+                               get or sets charging status: on = true, off = false.
                                
-                                       Cord connected (true), disconnected (false)
-                                       
-                               byte TargetChargeLevel [readonly]
+                       struct{ double, byte } BatteryVoltage [readonly]
+                       
+                               Voltage of battery (double) and Level of charge (0-100%) (byte).
                                
-                                       Level of charge capacity relative to factory charge rating (0-100%) (byte)
+                       bool BatteryChargeCord [readonly]
+                       
+                               Cord connected (true), disconnected (false)
                                
-                               uint16 TimeToFullCharge [readonly]
-                               
-                                       Number of minutes remaining until fully charged.
\ No newline at end of file
+                       byte TargetChargeLevel [readonly]
+                       
+                               Level of charge capacity relative to factory charge rating (0-100%) (byte)
+                       
+                       uint16 TimeToFullCharge [readonly]
+                       
+                               Number of minutes remaining until fully charged.
\ No newline at end of file

diff --git a/docs/runningstatus.txt b/docs/runningstatus.txt
index 2637b81..b6fb902 100644 (file)
--- a/docs/runningstatus.txt
+++ b/docs/runningstatus.txt
@@ -2,8 +2,8 @@ Running Status hierarchy
 =================
 
 Service         org.automotive
-Interface       org.automotive.runningstatus
-Object path     /
+Interface       org.automotive.runningStatus
+Object path     /runningStatus
 
 Properties     byte VehiclePowerMode [readonly]
                        

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f4a0a5c..159f202 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-set(amb_sources vehiclepowermodeproperty.cpp enginespeedproperty.cpp runningstatusinterface.cpp vehiclespeed.cpp abstractdbusinterface.cpp abstractproperty.cpp dbusinterfacemanager.cpp debugout.cpp)
+set(amb_sources tripmeterproperty.cpp fueleconomyproperty.cpp vehiclepowermodeproperty.cpp enginespeedproperty.cpp runningstatusinterface.cpp vehiclespeed.cpp abstractdbusinterface.cpp abstractproperty.cpp dbusinterfacemanager.cpp debugout.cpp)
 set(amb_headers_install abstractproperty.h vehiclespeed.h )
 include_directories( ${include_dirs} )
 add_library(amb SHARED ${amb_sources})

diff --git a/lib/CMakeLists.txt~ b/lib/CMakeLists.txt~
index e4ecdc6..6d96af2 100644 (file)
--- a/lib/CMakeLists.txt~
+++ b/lib/CMakeLists.txt~
@@ -1,5 +1,5 @@
 
-set(amb_sources enginespeedproperty.cpp runningstatusinterface.cpp vehiclespeed.cpp abstractdbusinterface.cpp abstractproperty.cpp dbusinterfacemanager.cpp debugout.cpp)
+set(amb_sources fueleconomyproperty.cpp vehiclepowermodeproperty.cpp enginespeedproperty.cpp runningstatusinterface.cpp vehiclespeed.cpp abstractdbusinterface.cpp abstractproperty.cpp dbusinterfacemanager.cpp debugout.cpp)
 set(amb_headers_install abstractproperty.h vehiclespeed.h )
 include_directories( ${include_dirs} )
 add_library(amb SHARED ${amb_sources})

diff --git a/plugins/exampleplugin.cpp b/plugins/exampleplugin.cpp
index a5dc1c7..b0f84d8 100644 (file)
--- a/plugins/exampleplugin.cpp
+++ b/plugins/exampleplugin.cpp
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "enginespeedproperty.h"
 #include "vehiclepowermodeproperty.h"
+#include "fueleconomyproperty.h"
 
 ExamplePlugin::ExamplePlugin()
 {
@@ -31,6 +32,9 @@ ExamplePlugin::ExamplePlugin()
        
        VehiclePowerModeProperty* vehiclePowerMode = new VehiclePowerModeProperty();
        vehiclePowerMode->setValue(VehiclePowerModeProperty::Run);
+       
+       FuelEconomyProperty* fueleconomyproperty = new FuelEconomyProperty();
+       fueleconomyproperty->setValue(42);
 }
 
 extern "C" void create()