aboutsummaryrefslogtreecommitdiffstats
path: root/java/direct_bt
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2020-06-01 02:52:08 +0200
committerSven Gothel <[email protected]>2020-06-01 02:52:08 +0200
commit171eda5060c20e190b960600e823c108c74ab2be (patch)
treefdfcf081c294753c0ba6b4f068e7397e9d5db650 /java/direct_bt
parent728cbb0c31ac8cab0cc6e7551c78adab5e2a4a4d (diff)
Clarify le_scan and conn[ection] arguments for whitelist and connect methods C++/Java, fix timeout semantics (API doc)
Diffstat (limited to 'java/direct_bt')
-rw-r--r--java/direct_bt/tinyb/DBTAdapter.java10
-rw-r--r--java/direct_bt/tinyb/DBTDevice.java14
2 files changed, 12 insertions, 12 deletions
diff --git a/java/direct_bt/tinyb/DBTAdapter.java b/java/direct_bt/tinyb/DBTAdapter.java
index e0d9aa02..d9f5f684 100644
--- a/java/direct_bt/tinyb/DBTAdapter.java
+++ b/java/direct_bt/tinyb/DBTAdapter.java
@@ -141,14 +141,14 @@ public class DBTAdapter extends DBTObject implements BluetoothAdapter
@Override
public boolean addDeviceToWhitelist(final String address, final BluetoothAddressType address_type,
final HCIWhitelistConnectType ctype,
- final short min_interval, final short max_interval,
- final short latency, final short timeout) {
+ final short conn_interval_min, final short conn_interval_max,
+ final short conn_latency, final short timeout) {
return addDeviceToWhitelist(address, address_type.value, ctype.value,
- min_interval, max_interval, latency, timeout);
+ conn_interval_min, conn_interval_max, conn_latency, timeout);
}
private native boolean addDeviceToWhitelist(final String address, final int address_type, final int ctype,
- final short min_interval, final short max_interval,
- final short latency, final short timeout);
+ final short conn_interval_min, final short conn_interval_max,
+ final short conn_latency, final short timeout);
@Override
public boolean addDeviceToWhitelist(final String address, final BluetoothAddressType address_type,
diff --git a/java/direct_bt/tinyb/DBTDevice.java b/java/direct_bt/tinyb/DBTDevice.java
index fa749afe..5f122720 100644
--- a/java/direct_bt/tinyb/DBTDevice.java
+++ b/java/direct_bt/tinyb/DBTDevice.java
@@ -279,12 +279,12 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
private native boolean connectImpl() throws BluetoothException;
@Override
- public boolean connect(final short interval, final short window,
- final short min_interval, final short max_interval,
- final short latency, final short timeout) {
+ public boolean connect(final short le_scan_interval, final short le_scan_window,
+ final short conn_interval_min, final short conn_interval_max,
+ final short conn_latency, final short timeout) {
boolean res = false;
if( !connected ) {
- res = connectImpl(interval, window, min_interval, max_interval, latency, timeout);
+ res = connectImpl(le_scan_interval, le_scan_window, conn_interval_min, conn_interval_max, conn_latency, timeout);
if( res ) {
connected = true;
if( null != userConnectedNotificationsCB ) {
@@ -301,9 +301,9 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
}
return res;
}
- private native boolean connectImpl(final short interval, final short window,
- final short min_interval, final short max_interval,
- final short latency, final short timeout);
+ private native boolean connectImpl(final short le_scan_interval, final short le_scan_window,
+ final short conn_interval_min, final short conn_interval_max,
+ final short conn_latency, final short timeout);
/* DBT Java callbacks */