diff --git a/library/src/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java b/library/src/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java index 399516f..3f03cb2 100644 --- a/library/src/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java +++ b/library/src/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java @@ -1,12 +1,10 @@ package uk.co.alt236.bluetoothlelib.device.mfdata; import java.util.Arrays; -import java.util.UUID; import uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice; import uk.co.alt236.bluetoothlelib.device.adrecord.AdRecord; import uk.co.alt236.bluetoothlelib.util.ByteUtils; -import android.util.Log; /** * Objectifies the Manufactured Data field of an iBeacon @@ -89,6 +87,10 @@ public final class IBeaconManufacturerData { return sb.toString(); } + public double getAccuracy(int rssi){ + return calculateAccuracy(mCalibratedTxPower, rssi); + } + public int getCalibratedTxPower(){ return mCalibratedTxPower; } diff --git a/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java b/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java index b8639f2..86dc9a9 100644 --- a/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java +++ b/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java @@ -96,6 +96,7 @@ import android.widget.TextView; viewHolder.ibeaconMinor.setText(String.valueOf(data.getMinor())); viewHolder.ibeaconTxPower.setText(String.valueOf(data.getCalibratedTxPower())); viewHolder.ibeaconUUID.setText(data.getUUID()); + viewHolder.ibeaconDistance.setText(String.valueOf(data.getAccuracy(device.getRssi()))); } else { viewHolder.deviceIcon.setImageResource(R.drawable.ic_bluetooth); viewHolder.ibeaconSection.setVisibility(View.GONE);