demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

ble: log names instead of numeric status and decode more BluetoothGattCallback status codes

Browse Source
This commit is contained in:
Thomas Kuehne
2025-05-16 20:04:17 +00:00
committed by José Rebelo
parent 221829cf53
commit d646197107
3 changed files with 91 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
+2 -1
View File
@@ -94,6 +94,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.service.btle.BleNamesResolver;
import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils;
import nodomain.freeyourgadget.gadgetbridge.util.BondingInterface;
import nodomain.freeyourgadget.gadgetbridge.util.BondingUtil;
@@ -903,7 +904,7 @@ public class DiscoveryActivityV2 extends AbstractGBActivity implements AdapterVi
final BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
if (device != null) {
final int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.BOND_NONE);
LOG.debug("Bond state: {}", bondState);
LOG.debug("Bond state: {}", BleNamesResolver.getBondStateString(bondState));
if (bondState == BluetoothDevice.BOND_BONDED) {
BondingUtil.handleDeviceBonded((BondingInterface) context, getCandidateFromMAC(device));
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
+81 -13
View File
@@ -107,31 +107,99 @@ public class BleNamesResolver {
/// lookup description for numeric status used by {@link android.bluetooth.BluetoothGattCallback}
static public String getStatusString(int status) {
// android.bluetooth.BluetoothGatt's numbers are incomplete
// numeric values taken from GattStatus in https://android.googlesource.com/platform/system/bt/+/ea7ab70a711e642653dd5922b83aa04a53af9e0e/stack/include/gatt_api.h
switch (status) {
case BluetoothGatt.GATT_SUCCESS:
return "SUCCESS";
return "GATT_SUCCESS";
case 0x01:
return "GATT_INVALID_HANDLE";
case BluetoothGatt.GATT_READ_NOT_PERMITTED:
return "READ_NOT_PERMITTED";
return "GATT_READ_NOT_PERMITTED";
case BluetoothGatt.GATT_WRITE_NOT_PERMITTED:
return "WRITE_NOT_PERMITTED";
return "GATT_WRITE_NOT_PERMITTED";
case 0x04:
return "GATT_INVALID_PDU";
case BluetoothGatt.GATT_INSUFFICIENT_AUTHENTICATION:
return "INSUFFICIENT_AUTHENTICATION";
return "GATT_INSUFFICIENT_AUTHENTICATION";
case BluetoothGatt.GATT_REQUEST_NOT_SUPPORTED:
return "REQUEST_NOT_SUPPORTED";
return "GATT_REQUEST_NOT_SUPPORTED";
case BluetoothGatt.GATT_INVALID_OFFSET:
return "INVALID_OFFSET";
return "GATT_INVALID_OFFSET";
case BluetoothGatt.GATT_INSUFFICIENT_AUTHORIZATION:
return "INSUFFICIENT_AUTHORIZATION";
return "GATT_INSUFFICIENT_AUTHORIZATION";
case 0x09:
return "GATT_PREPARE_Q_FULL";
case 0x0a:
return "GATT_NOT_FOUND";
case 0x0b:
return "GATT_NOT_LONG";
case 0x0c:
return "GATT_INSUF_KEY_SIZE";
case BluetoothGatt.GATT_INVALID_ATTRIBUTE_LENGTH:
return "GATT_INVALID_ATTRIBUTE_LENGTH";
case 0x0e:
return "GATT_ERR_UNLIKELY";
case BluetoothGatt.GATT_INSUFFICIENT_ENCRYPTION:
return "INSUFFICIENT_ENCRYPTION";
return "GATT_INSUFFICIENT_ENCRYPTION";
case 0x10:
return "GATT_UNSUPPORT_GRP_TYPE";
case 0x11:
return "GATT_INSUF_RESOURCE";
case 0x12:
return "GATT_DATABASE_OUT_OF_SYNC";
case 0x13:
return "GATT_VALUE_NOT_ALLOWED";
case 0x87:
return "GATT_ILLEGAL_PARAMETER";
case 0x7f:
return "GATT_TOO_SHORT";
case 0x80:
return "GATT_NO_RESOURCES";
case 0x81:
return "GATT_INTERNAL_ERROR";
case 0x82:
return "GATT_WRONG_STATE";
case 0x83:
return "GATT_DB_FULL";
case 0x84:
return "GATT_BUSY";
case 0x85:
return "GATT_ERROR";
case 0x86:
return "GATT_CMD_STARTED";
case 0x88:
return "GATT_PENDING";
case 0x89:
return "GATT_AUTH_FAIL";
case 0x8a:
return "GATT_MORE";
case 0x8b:
return "GATT_INVALID_CFG";
case 0x8c:
return "GATT_SERVICE_STARTED";
case 0x8d:
return "GATT_ENCRYPED_NO_MITM";
case 0x8e:
return "GATT_NOT_ENCRYPTED";
case BluetoothGatt.GATT_CONNECTION_CONGESTED:
return "CONNECTION_CONGESTED";
return "GATT_CONNECTION_CONGESTED";
case 0x90:
return "GATT_DUP_REG";
case 0x91:
return "GATT_ALREADY_OPEN";
case 0x92:
return "GATT_CANCEL";
case BluetoothGatt.GATT_CONNECTION_TIMEOUT:
return "CONNECTION_TIMEOUT";
return "GATT_CONNECTION_TIMEOUT";
case 0xFD:
return "GATT_CCC_CFG_ERR";
case 0xFE:
return "GATT_PRC_IN_PROGRESS";
case 0xFF:
return "GATT_OUT_OF_RANGE";
case BluetoothGatt.GATT_FAILURE:
return "FAILURE";
return "GATT_FAILURE";
default:
return "failed_" + status;
}
@@ -401,7 +469,7 @@ public class BleNamesResolver {
mServices.put("6a4e2800-667b-11e3-949a-0800200c9a66", "(Propr: Garmin ML)");
mServices.put("86f61000-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman State)");
mServices.put("86f65000-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman Request)");
mServices.put("86f66000-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman Data)");
mServices.put("86f66000-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman Data)");
mServices.put("8d53dc1d-1db7-4cd3-868b-8a527460aa84", "(Propr: SMP - Simple Management Protocol)");
// source https://bitbucket.org/bluetooth-SIG/public/src/main/assigned_numbers/uuids/characteristic_uuids.yaml
@@ -928,7 +996,7 @@ public class BleNamesResolver {
mCharacteristics.put("86f61001-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman State)");
mCharacteristics.put("86f65001-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman Command)");
mCharacteristics.put("86f65002-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman Response)");
mCharacteristics.put("86f66001-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman Data)");
mCharacteristics.put("86f66001-f706-58a0-95b2-1fb9261e4dc7", "(Propr: Ultrahuman Data)");
mCharacteristics.put("da2e7828-fbce-4e01-ae9e-261174997c48", "(Propr: SMP - Simple Management Protocol)");
mValueFormats.put(52, "32bit float");
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
+8 -6
View File
@@ -329,7 +329,7 @@ public final class BtLEQueue {
}
private void handleDisconnected(int status) {
LOG.debug("handleDisconnected: {}", status);
LOG.debug("handleDisconnected: {}", BleNamesResolver.getStatusString(status));
internalGattCallback.reset();
mTransactions.clear();
mPauseTransaction = false;
@@ -514,7 +514,9 @@ public final class BtLEQueue {
@Override
public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
LOG.debug("connection state change, newState: {} {}", BleNamesResolver.getStateString(newState), BleNamesResolver.getStatusString(status));
LOG.debug("connection state change, newState: {} {} {}",
BleNamesResolver.getStateString(newState), BleNamesResolver.getStatusString(status),
BleNamesResolver.getBondStateString(gatt.getDevice().getBondState()));
synchronized (mGattMonitor) {
if (mBluetoothGatt == null) {
@@ -527,12 +529,12 @@ public final class BtLEQueue {
}
if (status != BluetoothGatt.GATT_SUCCESS) {
LOG.warn("connection state event with error status {}", status);
LOG.warn("connection state event with error status {}", BleNamesResolver.getStatusString(status));
}
switch (newState) {
case BluetoothProfile.STATE_CONNECTED:
LOG.info("Connected to GATT server. ({})", BleNamesResolver.getBondStateString(gatt.getDevice().getBondState()));
LOG.info("Connected to GATT server.");
setDeviceConnectionState(State.CONNECTED);
// Attempts to discover services after successful connection.
List<BluetoothGattService> cachedServices = gatt.getServices();
@@ -578,7 +580,7 @@ public final class BtLEQueue {
mConnectionLatch.countDown();
}
} else {
LOG.warn("onServicesDiscovered received: {}", status);
LOG.warn("onServicesDiscovered received: {}", BleNamesResolver.getStatusString(status));
}
}
@@ -809,7 +811,7 @@ public final class BtLEQueue {
}
if (status != BluetoothGatt.GATT_SUCCESS) {
LOG.warn("gatt server connection state event with error status {}", status);
LOG.warn("gatt server connection state event with error status {}", BleNamesResolver.getStatusString(status));
}
}