From: Kevron Rees Date: Mon, 1 Apr 2013 20:07:04 +0000 (-0700) Subject: lots of comments inline X-Git-Tag: 0.8.1~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6dd9fef5874595672463daf132fc4e2601a329a2;p=profile%2Fivi%2Fautomotive-message-broker.git lots of comments inline --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e3a081..d8cfb88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_BUILD_TYPE, Debug) include(FindPkgConfig) set(PROJECT_NAME "automotive-message-broker") -set(PROJECT_VERSION "0.7.9") +set(PROJECT_VERSION "0.8.9") add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}") add_definitions(-DPROJECT_NAME="${PROJECT_NAME}") @@ -31,10 +31,10 @@ if(opencvlux_plugin) endif(opencvlux_plugin) include (CMakeForceCompiler) -option(ENABLE_ICECC "Enable icecc checking, for distributed compilation" OFF) +option(ENABLE_ICECC "Enable icecc checking, for distributed compilation" ON) if (ENABLE_ICECC) - find_program(ICECC icecc) + find_program(ICECC /usr/lib/icecc/bin/c++) if (ICECC) message(STATUS "icecc will be used for distributed compiling") cmake_force_cxx_compiler(${ICECC} icecc) diff --git a/plugins/dbus/maintenance.h b/plugins/dbus/maintenance.h index ab32a88..1c8cfd5 100644 --- a/plugins/dbus/maintenance.h +++ b/plugins/dbus/maintenance.h @@ -16,6 +16,7 @@ public: /** @attributeName Odometer * @type unsigned long * @access readonly + * @attributeComment \brief MUST return Distance traveled in km **/ wantProperty(VehicleProperty::Odometer, "Odometer", "i", AbstractProperty::Read); @@ -23,6 +24,36 @@ public: } }; +/** @interface Fluid : VehiclePropertyType **/ +class FluidProperty : public DBusSink +{ +public: + FluidProperty(AbstractRoutingEngine* re, GDBusConnection* connection) + :DBusSink("org.automotive.Fluid","/org/automotive/maintenance/Fluid", re, connection, map()) + { + /** @attributeName Transmission + * @type unsigned short + * @access readonly + * @attributeComment \brief MUST return Transmission fluid level percentage. 0-100. + **/ + wantProperty(VehicleProperty::TransmissionFluidLevel, "Transmission", "q", AbstractProperty::Read); + + /** @attributeName Brake + * @type unsigned short + * @access readonly + * @attributeComment \brief MUST return Brake fluid level percentage. 0-100. + **/ + wantProperty(VehicleProperty::BrakeFluidLevel, "Brake", "q", AbstractProperty::Read); + + /** @attributeName Washer + * @type unsigned short + * @access readonly + * @attributeComment \brief MUST return Washer fluid level percentage. 0-100. + **/ + wantProperty(VehicleProperty::WasherFluidLevel, "Washer", "q", AbstractProperty::Read); + } +}; + /** @interface Battery : VehiclePropertyType **/ class BatteryProperty: public DBusSink { @@ -33,12 +64,14 @@ public: /** @attributeName Voltage * @type double * @access readonly + * @attributeComment \brief MUST return battery voltage. **/ wantProperty(VehicleProperty::BatteryVoltage, "Voltage", "d", AbstractProperty::Read); /** @attributeName Current * @type double * @access readonly + * @attributeComment \brief MUST return battery current in Amperes **/ wantProperty(VehicleProperty::BatteryCurrent, "Current", "d", AbstractProperty::Read); supportedChanged(re->supported()); @@ -55,24 +88,28 @@ public: /** @attributeName LeftFront * @type double * @access readonly + * @attributeComment \brief MUST return left front tire pressure in kPa. **/ wantProperty(VehicleProperty::TirePressureLeftFront, "LeftFront", "d", AbstractProperty::Read); /** @attributeName RightFront * @type double * @access readonly + * @attributeComment \brief MUST return right front tire pressure in kPa. **/ wantProperty(VehicleProperty::TirePressureRightFront, "RightFront", "d", AbstractProperty::Read); /** @attributeName LeftRear * @type double * @access readonly + * @attributeComment \brief MUST return left rear tire pressure in kPa. **/ wantProperty(VehicleProperty::TirePressureLeftRear, "LeftRear", "d", AbstractProperty::Read); /** @attributeName RightRear * @type double * @access readonly + * @attributeComment \brief MUST return right rear tire pressure in kPa. **/ wantProperty(VehicleProperty::TirePressureRightRear, "RightRear", "d", AbstractProperty::Read); supportedChanged(re->supported()); @@ -89,24 +126,28 @@ public: /** @attributeName LeftFront * @type double * @access readonly + * @attributeComment \brief MUST return left front tire temperature in Celcius. **/ wantProperty(VehicleProperty::TireTemperatureLeftFront, "LeftFront", "d", AbstractProperty::Read); /** @attributeName RightFront * @type double * @access readonly + * @attributeComment \brief MUST return right front tire temperature in Celcius. **/ wantProperty(VehicleProperty::TireTemperatureRightFront, "RightFront", "d", AbstractProperty::Read); /** @attributeName LeftRear * @type double * @access readonly + * @attributeComment \brief MUST return left rear tire temperature in Celcius. **/ wantProperty(VehicleProperty::TireTemperatureLeftRear, "LeftRear", "d", AbstractProperty::Read); /** @attributeName RightRear * @type double * @access readonly + * @attributeComment \brief MUST return right rear tire temperature in Celcius. **/ wantProperty(VehicleProperty::TireTemperatureRightRear, "RightRear", "d", AbstractProperty::Read); supportedChanged(re->supported()); diff --git a/plugins/dbus/runningstatus.h b/plugins/dbus/runningstatus.h index 09dd705..05be09f 100644 --- a/plugins/dbus/runningstatus.h +++ b/plugins/dbus/runningstatus.h @@ -31,7 +31,7 @@ public: :DBusSink("org.automotive.VehicleSpeed","/org/automotive/runningstatus/VehicleSpeed", re, connection, map()) { /** @attributeName VehicleSpeed - * @type unsigned short + * @type unsigned long * @access readonly **/ wantProperty(VehicleProperty::VehicleSpeed,"VehicleSpeed", "i", AbstractProperty::Read); @@ -49,7 +49,7 @@ public: :DBusSink("org.automotive.EngineSpeed","/org/automotive/runningstatus/EngineSpeed", re, connection, map()) { /** @attributeName EngineSpeed - * @type unsigned short + * @type unsigned long * @access readonly **/ wantProperty(VehicleProperty::EngineSpeed,"EngineSpeed", "i", AbstractProperty::Read);