diff options
| -rw-r--r-- | java/direct_bt/tinyb/DBTGattCharacteristic.java | 2 | ||||
| -rw-r--r-- | java/direct_bt/tinyb/DBTGattDescriptor.java | 2 | ||||
| -rw-r--r-- | java/direct_bt/tinyb/DBTGattService.java | 2 | ||||
| -rw-r--r-- | java/tinyb/dbus/DBusAdapter.java | 5 | ||||
| -rw-r--r-- | java/tinyb/dbus/DBusDevice.java | 5 | ||||
| -rw-r--r-- | java/tinyb/dbus/DBusGattCharacteristic.java | 5 | ||||
| -rw-r--r-- | java/tinyb/dbus/DBusGattDescriptor.java | 5 | ||||
| -rw-r--r-- | java/tinyb/dbus/DBusGattService.java | 5 |
8 files changed, 28 insertions, 3 deletions
diff --git a/java/direct_bt/tinyb/DBTGattCharacteristic.java b/java/direct_bt/tinyb/DBTGattCharacteristic.java index 0233eff9..7a0973f1 100644 --- a/java/direct_bt/tinyb/DBTGattCharacteristic.java +++ b/java/direct_bt/tinyb/DBTGattCharacteristic.java @@ -310,7 +310,7 @@ public class DBTGattCharacteristic extends DBTObject implements BluetoothGattCha @Override public final String toString() { if( !isValid() ) { - return "Characteristic" + "\u271D" + "[handle 0x"+Integer.toHexString(handle)+"]"; + return "Characteristic" + "\u271D" + "[uuid "+getUUID()+", handle 0x"+Integer.toHexString(handle)+"]"; } return toStringImpl(); } diff --git a/java/direct_bt/tinyb/DBTGattDescriptor.java b/java/direct_bt/tinyb/DBTGattDescriptor.java index 2733f8ba..bef26e91 100644 --- a/java/direct_bt/tinyb/DBTGattDescriptor.java +++ b/java/direct_bt/tinyb/DBTGattDescriptor.java @@ -153,7 +153,7 @@ public class DBTGattDescriptor extends DBTObject implements BluetoothGattDescrip @Override public final String toString() { if( !isValid() ) { - return "Descriptor" + "\u271D" + "[handle 0x"+Integer.toHexString(handle)+"]"; + return "Descriptor" + "\u271D" + "[uuid "+getUUID()+", handle 0x"+Integer.toHexString(handle)+"]"; } return toStringImpl(); } diff --git a/java/direct_bt/tinyb/DBTGattService.java b/java/direct_bt/tinyb/DBTGattService.java index 4dbcc71e..a319a894 100644 --- a/java/direct_bt/tinyb/DBTGattService.java +++ b/java/direct_bt/tinyb/DBTGattService.java @@ -122,7 +122,7 @@ public class DBTGattService extends DBTObject implements BluetoothGattService @Override public final String toString() { if( !isValid() ) { - return "Service" + "\u271D" + "[handles [0x"+Integer.toHexString(handleStart)+".."+Integer.toHexString(handleEnd)+"]]"; + return "Service" + "\u271D" + "[uuid "+getUUID()+", handles [0x"+Integer.toHexString(handleStart)+".."+Integer.toHexString(handleEnd)+"]]"; } return toStringImpl(); } diff --git a/java/tinyb/dbus/DBusAdapter.java b/java/tinyb/dbus/DBusAdapter.java index b8866534..5a3760c1 100644 --- a/java/tinyb/dbus/DBusAdapter.java +++ b/java/tinyb/dbus/DBusAdapter.java @@ -235,4 +235,9 @@ public class DBusAdapter extends DBusObject implements BluetoothAdapter { super(instance); } + + @Override + public String toString() { + return "Adapter["+getAddress()+", '"+getName()+"']"; + } } diff --git a/java/tinyb/dbus/DBusDevice.java b/java/tinyb/dbus/DBusDevice.java index ac12d01e..023607ed 100644 --- a/java/tinyb/dbus/DBusDevice.java +++ b/java/tinyb/dbus/DBusDevice.java @@ -255,4 +255,9 @@ public class DBusDevice extends DBusObject implements BluetoothDevice ts_creation = BluetoothUtils.getCurrentMilliseconds(); } final long ts_creation; + + @Override + public String toString() { + return "Device[address["+getAddress()+", "+getAddressType()+"], '"+getName()+"']"; + } } diff --git a/java/tinyb/dbus/DBusGattCharacteristic.java b/java/tinyb/dbus/DBusGattCharacteristic.java index 6e1e0839..719d4369 100644 --- a/java/tinyb/dbus/DBusGattCharacteristic.java +++ b/java/tinyb/dbus/DBusGattCharacteristic.java @@ -114,4 +114,9 @@ public class DBusGattCharacteristic extends DBusObject implements BluetoothGattC public int removeAllCharacteristicListener() { return 0; // FIXME } + + @Override + public String toString() { + return "Characteristic[uuid "+getUUID()+"]"; + } } diff --git a/java/tinyb/dbus/DBusGattDescriptor.java b/java/tinyb/dbus/DBusGattDescriptor.java index 5c59ea8c..bbb9cf04 100644 --- a/java/tinyb/dbus/DBusGattDescriptor.java +++ b/java/tinyb/dbus/DBusGattDescriptor.java @@ -73,4 +73,9 @@ public class DBusGattDescriptor extends DBusObject implements BluetoothGattDescr { super(instance); } + + @Override + public String toString() { + return "Descriptor[uuid "+getUUID()+"]"; + } } diff --git a/java/tinyb/dbus/DBusGattService.java b/java/tinyb/dbus/DBusGattService.java index 092662a8..aead8e2f 100644 --- a/java/tinyb/dbus/DBusGattService.java +++ b/java/tinyb/dbus/DBusGattService.java @@ -77,4 +77,9 @@ public class DBusGattService extends DBusObject implements BluetoothGattService { super(instance); } + + @Override + public String toString() { + return "Service[uuid "+getUUID()+"]"; + } } |