From e7fd20ecf24b2e7d1ae56b5cf3f33c6373a2f639 Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Tue, 11 Nov 2014 10:20:50 -0800 Subject: [PATCH] version bump 0.12.802 --- CMakeLists.txt | 2 +- plugins/bluemonkey/config.js | 3 +++ xwalk/vehicle.cc | 3 +++ xwalk/vehicle.html | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5174b92..dd98be8 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.12.801") +set(PROJECT_VERSION "0.12.802") set(PROJECT_CODENAME "agera") set(PROJECT_QUALITY "alpha") diff --git a/plugins/bluemonkey/config.js b/plugins/bluemonkey/config.js index ee2c168..7f388af 100644 --- a/plugins/bluemonkey/config.js +++ b/plugins/bluemonkey/config.js @@ -48,6 +48,9 @@ bluemonkey.createCustomProperty("AccelerationZ", 10); bluemonkey.createCustomProperty("SteeringWheelAngleW3C", 10); bluemonkey.createCustomProperty("WheelTick", 1000); +bluemonkey.createCustomProperty("EngineCoolantLevel", 100); +bluemonkey.createCustomProperty("EngineCoolantTemperature", 60); + bluemonkey.createCustomProperty("IgnitionTimeOn", 5000); bluemonkey.createCustomProperty("IgnitionTimeOff", 5000); diff --git a/xwalk/vehicle.cc b/xwalk/vehicle.cc index a56a3f6..2fa2fb6 100644 --- a/xwalk/vehicle.cc +++ b/xwalk/vehicle.cc @@ -629,6 +629,7 @@ void Vehicle::Set(const std::string &object_name, picojson::object value, if (proxy_error_ptr) { DebugOut(DebugOut::Error) << "Error creating property proxy for " << object_path << std::endl; + PostError(&callback, vehicle_error_unknown); return; } @@ -674,6 +675,7 @@ void Vehicle::Set(const std::string &object_name, picojson::object value, if (!v) { DebugOut(DebugOut::Error) << "Error converting value to GVariant" << endl; PostError(&callback, vehicle_error_unknown); + return; } GError* set_error = nullptr; @@ -695,6 +697,7 @@ void Vehicle::Set(const std::string &object_name, picojson::object value, { DebugOut(DebugOut::Error) << "permission denied" << endl; PostError(&callback, vehicle_error_permission_denied); + return; } PostError(&callback, vehicle_error_unknown); return; diff --git a/xwalk/vehicle.html b/xwalk/vehicle.html index 1bf3f65..474b5f3 100644 --- a/xwalk/vehicle.html +++ b/xwalk/vehicle.html @@ -18,7 +18,7 @@ function get(objName) { } }, function(error) { - debug("error getting " + objName ": " + error.message); + debug("error getting " + objName + ": " + error.message); }); } @@ -58,7 +58,7 @@ vehicle.vehicleSpeed.get("invalidzone").then(function() { }, ///test set() debug("testing set()"); -vehicle.lightStatus.set({"fog" : true}).then(function() { +vehicle.lightStatus.set({"fog" : false}).then(function() { debug("set success!"); }, function(error) { debug("set fail! " + error.message); -- 2.7.4