From: Lukasz Bardeli Date: Wed, 24 Aug 2016 10:09:11 +0000 (+0200) Subject: [BluetoothLE] add rssi attribute X-Git-Tag: submit/tizen/20160831.012604~7^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=602432c1855c8d56e822d5c5e75867373acc82d9;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [BluetoothLE] add rssi attribute [Verification] checked in console var adapter = tizen.bluetooth.getLEAdapter(); adapter.startScan( function onsuccess(device) { console.log("[Found device] address: " + device.address); console.log("[Found device] rssi: " + device.rssi);} ); Change-Id: Ie507d36eb3a270c5acbcf7f51af465845ae1df7c Signed-off-by: Lukasz Bardeli --- diff --git a/src/bluetooth/bluetooth_api.js b/src/bluetooth/bluetooth_api.js index c1c1864c..bebe73e3 100755 --- a/src/bluetooth/bluetooth_api.js +++ b/src/bluetooth/bluetooth_api.js @@ -559,7 +559,7 @@ BluetoothSocket.prototype.close = function() { //class BluetoothLEDevice //////////////////////////////////////////////////// var BluetoothLEDevice = function(data) { var address = "", name = null, txpowerlevel = null, appearance = null, uuids = null, - solicitationuuids = null, serviceData = null, manufacturerData = null; + solicitationuuids = null, serviceData = null, manufacturerData = null, rssi = null; if (data) { address = data.address; @@ -576,6 +576,9 @@ var BluetoothLEDevice = function(data) { if (data.manufacturerData) { manufacturerData = new tizen.BluetoothLEManufacturerData(data.manufacturerData); } + if (data.rssi) { + rssi = data.rssi; + } } Object.defineProperties(this, { @@ -604,7 +607,8 @@ var BluetoothLEDevice = function(data) { manufacturerData : { value: manufacturerData, writable: false, - enumerable: true} + enumerable: true}, + rssi : {value: rssi, writable: false, enumerable: true} }); }; diff --git a/src/bluetooth/bluetooth_le_device.cc b/src/bluetooth/bluetooth_le_device.cc index 2c571607..a4f27dc8 100755 --- a/src/bluetooth/bluetooth_le_device.cc +++ b/src/bluetooth/bluetooth_le_device.cc @@ -48,6 +48,7 @@ const std::string kManufacturerData = "manufacturerData"; const std::string kId = "id"; const std::string kData = "data"; const std::string kAction = "action"; +const std::string kRSSI = "rssi"; const std::string kOnConnected = "onconnected"; const std::string kOnDisconnected = "ondisconnected"; @@ -305,6 +306,10 @@ PlatformResult BluetoothLEDevice::ToJson( g_free(manufacturer_data); } + le_device->insert( + std::make_pair(kRSSI, + picojson::value(static_cast(info->rssi)))); + return PlatformResult(ErrorCode::NO_ERROR); }