mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge.git
synced 2026-07-31 07:44:24 +02:00
Add multi channel BLE device abstract classes
This change adds a class that mirrors AbstractBTLEDeviceSupport, except that it holds and arrays of bluetooth queues instead of just one. This allows a single GBDevice to be composited into a single DeviceSupport class. This is useful if there is a gadget that has multiple bluetooth radios, but the gadget is a single device. It could also be useful if multiple gadgets were to be grouped under a single Device (such as a display and a remote), this way the support class can access both devices fully without having to send messages or it can aggregate calls to things like onNotification and make sure it is sent to all devices. My main goal is to add support for the Even Realities G1 Smart Glasses which use two BLE radios (one for each lens of the glasses). This code is quite well tested on the following branch:
This commit is contained in:
jrthomas270
+28
-3
@@ -63,6 +63,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.BatteryLevelDao;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.CyclingSample;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.Device;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.DeviceAttributes;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.DeviceAttributesDao;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
|
||||
@@ -135,13 +136,37 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public GBDevice createDevice(GBDeviceCandidate candidate, DeviceType deviceType) {
|
||||
GBDevice gbDevice = new GBDevice(candidate.getDevice().getAddress(), candidate.getName(), null, null, deviceType);
|
||||
protected void setBatteryConfigOnDevice(GBDevice gbDevice) {
|
||||
for (BatteryConfig batteryConfig : getBatteryConfig(gbDevice)) {
|
||||
gbDevice.setBatteryIcon(batteryConfig.getBatteryIcon(), batteryConfig.getBatteryIndex());
|
||||
gbDevice.setBatteryLabel(batteryConfig.getBatteryLabel(), batteryConfig.getBatteryIndex());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public GBDevice createDevice(GBDeviceCandidate candidate, DeviceType deviceType) {
|
||||
GBDevice gbDevice = new GBDevice(candidate.getDevice().getAddress(), candidate.getName(), null, null, deviceType);
|
||||
setBatteryConfigOnDevice(gbDevice);
|
||||
return gbDevice;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GBDevice createDevice(Device dbDevice, DeviceType deviceType) {
|
||||
GBDevice gbDevice =
|
||||
new GBDevice(dbDevice.getIdentifier(), dbDevice.getName(), dbDevice.getAlias(),
|
||||
dbDevice.getParentFolder(), deviceType);
|
||||
|
||||
setBatteryConfigOnDevice(gbDevice);
|
||||
|
||||
List<DeviceAttributes> deviceAttributesList = dbDevice.getDeviceAttributesList();
|
||||
if (!deviceAttributesList.isEmpty()) {
|
||||
gbDevice.setModel(dbDevice.getModel());
|
||||
DeviceAttributes attrs = deviceAttributesList.get(0);
|
||||
gbDevice.setFirmwareVersion(attrs.getFirmwareVersion1());
|
||||
gbDevice.setFirmwareVersion2(attrs.getFirmwareVersion2());
|
||||
gbDevice.setVolatileAddress(attrs.getVolatileIdentifier());
|
||||
}
|
||||
|
||||
return gbDevice;
|
||||
}
|
||||
|
||||
|
||||
+24
-5
@@ -24,6 +24,11 @@ import android.bluetooth.le.ScanFilter;
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
|
||||
import androidx.annotation.DrawableRes;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.StringRes;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
@@ -31,11 +36,6 @@ import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import androidx.annotation.DrawableRes;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.StringRes;
|
||||
|
||||
import nodomain.freeyourgadget.gadgetbridge.GBException;
|
||||
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettings;
|
||||
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
|
||||
@@ -44,6 +44,7 @@ import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabi
|
||||
import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetManager;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.CyclingSample;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.Device;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
|
||||
import nodomain.freeyourgadget.gadgetbridge.model.AbstractNotificationPattern;
|
||||
@@ -158,8 +159,26 @@ public interface DeviceCoordinator {
|
||||
@NonNull
|
||||
Collection<? extends ScanFilter> createBLEScanFilters();
|
||||
|
||||
/**
|
||||
* Creates a GBDevice from a candidate device. This is used to create a device based on the
|
||||
* results of a device scan (bluetooth or otherwise).
|
||||
*
|
||||
* @param candidate - The candidate that should be converted to a GBDevice.
|
||||
* @param type - The type of the device.
|
||||
* @return - The constructed GBDevice.
|
||||
*/
|
||||
GBDevice createDevice(GBDeviceCandidate candidate, DeviceType type);
|
||||
|
||||
/**
|
||||
* Creates a GBDevice from a database device. This is used to deserialize the device from the
|
||||
* persistent storage.
|
||||
*
|
||||
* @param dbDevice - The device object pulled from persistent storage.
|
||||
* @param type - The type of the device.
|
||||
* @return - The constructed GBDevice.
|
||||
*/
|
||||
GBDevice createDevice(Device dbDevice, DeviceType type);
|
||||
|
||||
/**
|
||||
* Deletes all information, including all related database content about the
|
||||
* given device.
|
||||
|
||||
+578
@@ -0,0 +1,578 @@
|
||||
/* Copyright (C) 2015-2024 Andreas Böhler, Arjan Schrijver, Carsten Pfeiffer,
|
||||
Daniel Dakhno, Daniele Gobbetti, Johannes Krude, JohnnySun, José Rebelo
|
||||
|
||||
This file is part of Gadgetbridge.
|
||||
|
||||
Gadgetbridge is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Gadgetbridge is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
||||
package nodomain.freeyourgadget.gadgetbridge.service.btle;
|
||||
|
||||
import android.bluetooth.BluetoothAdapter;
|
||||
import android.bluetooth.BluetoothDevice;
|
||||
import android.bluetooth.BluetoothGatt;
|
||||
import android.bluetooth.BluetoothGattCharacteristic;
|
||||
import android.bluetooth.BluetoothGattDescriptor;
|
||||
import android.bluetooth.BluetoothGattService;
|
||||
import android.content.Context;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
import nodomain.freeyourgadget.gadgetbridge.Logging;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
|
||||
import nodomain.freeyourgadget.gadgetbridge.service.AbstractDeviceSupport;
|
||||
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.CheckInitializedAction;
|
||||
import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.AbstractBleProfile;
|
||||
|
||||
/**
|
||||
* Abstract base class for all devices connected through Bluetooth Low Energy (LE) aka
|
||||
* Bluetooth Smart.
|
||||
* <p/>
|
||||
* The connection to the device and all communication is made with a generic {@link BtLEQueue}.
|
||||
* Messages to the device are encoded as {@link BtLEAction actions} or {@link BtLEServerAction actions}
|
||||
* that are grouped with a {@link Transaction} or {@link ServerTransaction} and sent via {@link BtLEQueue}.
|
||||
*
|
||||
* @see TransactionBuilder
|
||||
* @see BtLEQueue
|
||||
*/
|
||||
public abstract class AbstractBTLEMultiDeviceSupport extends AbstractDeviceSupport
|
||||
implements GattCallback, GattServerCallback {
|
||||
public static final String BASE_UUID = "0000%s-0000-1000-8000-00805f9b34fb";
|
||||
private static final Logger LOG = LoggerFactory.getLogger(AbstractBTLEMultiDeviceSupport.class);
|
||||
|
||||
private final int deviceCount;
|
||||
private final Set<UUID>[] mSupportedServices;
|
||||
private final Set<BluetoothGattService>[] mSupportedServerServices;
|
||||
private final Logger logger;
|
||||
private final List<AbstractBleProfile<?>> mSupportedProfiles = new ArrayList<>();
|
||||
//this is common for all BTLE devices. see http://stackoverflow.com/questions/18699251/finding-out-android-bluetooth-le-gatt-profiles
|
||||
private final Object characteristicsMonitor = new Object();
|
||||
private final int[] mMTUs;
|
||||
private final BtLEQueue[] mQueues;
|
||||
private final BleIntentApi[] bleApis;
|
||||
private final GBDevice[] devices;
|
||||
private final Map<UUID, BluetoothGattCharacteristic>[] mAvailableCharacteristics;
|
||||
|
||||
public AbstractBTLEMultiDeviceSupport(Logger logger, int deviceCount) {
|
||||
this.logger = logger;
|
||||
this.deviceCount = deviceCount;
|
||||
mSupportedServices = new Set[deviceCount];
|
||||
mSupportedServerServices = new Set[deviceCount];
|
||||
mMTUs = new int[deviceCount];
|
||||
for (int i = 0; i < deviceCount; i++) {
|
||||
mSupportedServices[i] = new HashSet<>(4);
|
||||
mSupportedServerServices[i] = new HashSet<>(4);
|
||||
mMTUs[i] = 23;
|
||||
}
|
||||
mQueues = new BtLEQueue[deviceCount];
|
||||
bleApis = new BleIntentApi[deviceCount];
|
||||
devices = new GBDevice[deviceCount];
|
||||
mAvailableCharacteristics = new Map[deviceCount];
|
||||
if (logger == null) {
|
||||
throw new IllegalArgumentException("logger must not be null");
|
||||
}
|
||||
}
|
||||
|
||||
public AbstractBTLEMultiDeviceSupport(Logger logger) {
|
||||
this(logger, 1);
|
||||
}
|
||||
|
||||
private void validateDeviceIndex(int deviceIdx) {
|
||||
if (deviceIdx < 0 || deviceIdx > deviceCount) {
|
||||
throw new IllegalArgumentException(
|
||||
"Request device index " + deviceIdx + " doesn't exist.");
|
||||
}
|
||||
}
|
||||
|
||||
public BtLEQueue getQueue() {
|
||||
return getQueue(0);
|
||||
}
|
||||
|
||||
public BtLEQueue getQueue(int deviceIdx) {
|
||||
validateDeviceIndex(deviceIdx);
|
||||
return mQueues[deviceIdx];
|
||||
}
|
||||
|
||||
public GBDevice getDevice(int deviceIdx) {
|
||||
validateDeviceIndex(deviceIdx);
|
||||
return devices[deviceIdx];
|
||||
}
|
||||
|
||||
private int getDeviceIndexForAddress(String address) {
|
||||
// Shortcut for one device.
|
||||
if (deviceCount == 1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (int i = 0; i < deviceCount; i++) {
|
||||
if (devices[i] != null && devices[i].getAddress().equals(address)) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
throw new IllegalArgumentException("No sub device with address: " + address);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean connect() {
|
||||
// Connect to the queue for each device.
|
||||
for (int i = 0; i < deviceCount; i++) {
|
||||
if (mQueues[i] == null && devices[i] != null) {
|
||||
mQueues[i] =
|
||||
new BtLEQueue(getBluetoothAdapter(), devices[i], this, this, getContext(),
|
||||
mSupportedServerServices[i]);
|
||||
if (bleApis[i] != null) {
|
||||
bleApis[i].setQueue(mQueues[i]);
|
||||
}
|
||||
mQueues[i].setAutoReconnect(getAutoReconnect());
|
||||
mQueues[i].setScanReconnect(getScanReconnect());
|
||||
mQueues[i].setImplicitGattCallbackModify(getImplicitCallbackModify());
|
||||
mQueues[i].setSendWriteRequestResponse(getSendWriteRequestResponse());
|
||||
}
|
||||
|
||||
if (mQueues[i] != null && !mQueues[i].connect()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public void disconnect() {
|
||||
for (BtLEQueue queue : mQueues) {
|
||||
if (queue != null) {
|
||||
queue.disconnect();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSendConfiguration(String config) {
|
||||
for (BleIntentApi bleApi : bleApis) {
|
||||
if (bleApi != null) {
|
||||
bleApi.onSendConfiguration(config);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void setDevice(GBDevice device, int deviceIdx) {
|
||||
validateDeviceIndex(deviceIdx);
|
||||
devices[deviceIdx] = device;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setContext(GBDevice device, BluetoothAdapter btAdapter, Context context) {
|
||||
super.setContext(device, btAdapter, context);
|
||||
|
||||
// Device 0 should be the parent device.
|
||||
devices[0] = device;
|
||||
for (int i = 0; i < deviceCount; i++) {
|
||||
if (devices[i] != null && BleIntentApi.isEnabled(device)) {
|
||||
bleApis[i] = new BleIntentApi(context, device);
|
||||
bleApis[i].handleBLEApiPrefs();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether the gatt callback should be implicitly set to the one on the transaction,
|
||||
* even if it was not set directly on the transaction. If true, the gatt callback will always
|
||||
* be set to the one in the transaction, even if null and not explicitly set to null.
|
||||
* See <a href="https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2912">#2912</a> for
|
||||
* more information. This is false by default, but we are making it configurable to avoid breaking
|
||||
* older devices that rely on this behavior, so all older devices got this overridden to true.
|
||||
*/
|
||||
public boolean getImplicitCallbackModify() {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether to send a write request response to the device, if requested. The standard actually
|
||||
* expects this to happen, but Gadgetbridge did not originally support it. This is set to true
|
||||
* on all older devices that were not confirmed to handle the response well after this was introduced.
|
||||
* <p>
|
||||
* See also: <a href="https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2831#issuecomment-941568">#2831#issuecomment-941568</a>
|
||||
*
|
||||
* @return whether to send write request responses, if a response is requested
|
||||
*/
|
||||
public boolean getSendWriteRequestResponse() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAutoReconnect(boolean enable) {
|
||||
super.setAutoReconnect(enable);
|
||||
for (BtLEQueue queue : mQueues) {
|
||||
if (queue != null) {
|
||||
queue.setAutoReconnect(enable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Subclasses should populate the given builder to initialize the device (if necessary).
|
||||
*
|
||||
* @return the same builder as passed as the argument
|
||||
*/
|
||||
protected TransactionBuilder initializeDevice(TransactionBuilder builder, int deviceIdx) {
|
||||
return builder;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dispose() {
|
||||
for (int i = 0; i < deviceCount; i++) {
|
||||
if (mQueues[i] != null) {
|
||||
mQueues[i].dispose();
|
||||
mQueues[i] = null;
|
||||
}
|
||||
if (bleApis[i] != null) {
|
||||
bleApis[i].dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public TransactionBuilder createTransactionBuilder(String taskName) {
|
||||
return new TransactionBuilder(taskName);
|
||||
}
|
||||
|
||||
public ServerTransactionBuilder createServerTransactionBuilder(String taskName) {
|
||||
return new ServerTransactionBuilder(taskName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send commands like this to the device:
|
||||
* <p>
|
||||
* <code>performInitialized("sms notification").write(someCharacteristic, someByteArray).queue(getQueue());</code>
|
||||
* </p>
|
||||
* This will asynchronously
|
||||
* <ul>
|
||||
* <li>connect to the device (if necessary)</li>
|
||||
* <li>initialize the device (if necessary)</li>
|
||||
* <li>execute the commands collected with the returned transaction builder</li>
|
||||
* </ul>
|
||||
*
|
||||
* @see #performConnected(Transaction, int)
|
||||
* @see #initializeDevice(TransactionBuilder, int)
|
||||
*/
|
||||
public TransactionBuilder performInitialized(String taskName, int deviceIdx)
|
||||
throws IOException {
|
||||
if (devices[deviceIdx] == null) {
|
||||
throw new IllegalArgumentException(
|
||||
"Requested device index " + deviceIdx + " doesn't exist.");
|
||||
}
|
||||
if (!isConnected()) {
|
||||
LOG.debug("Connecting to device for {}", taskName);
|
||||
if (!connect()) {
|
||||
throw new IOException("1: Unable to connect to device: " + getDevice(deviceIdx));
|
||||
}
|
||||
}
|
||||
if (!devices[deviceIdx].isInitialized()) {
|
||||
LOG.debug("Initializing device for {}", taskName);
|
||||
// first, add a transaction that performs device initialization
|
||||
TransactionBuilder builder = createTransactionBuilder("Initialize device");
|
||||
builder.add(new CheckInitializedAction(devices[deviceIdx]));
|
||||
initializeDevice(builder, deviceIdx).queue(getQueue(deviceIdx));
|
||||
}
|
||||
return createTransactionBuilder(taskName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures that the device is connected and (only then) performs the actions of the given
|
||||
* transaction builder.
|
||||
* <p>
|
||||
* In contrast to {@link #performInitialized(String, int)}, no initialization sequence is performed
|
||||
* with the device, only the actions of the given builder are executed.
|
||||
*
|
||||
* @throws IOException if unable to connect to the device
|
||||
* @see #performInitialized(String, int)
|
||||
*/
|
||||
public void performConnected(Transaction transaction, int deviceIdx) throws IOException {
|
||||
if (!isConnected()) {
|
||||
if (!connect()) {
|
||||
throw new IOException("2: Unable to connect to device: " + getDevice(deviceIdx));
|
||||
}
|
||||
}
|
||||
getQueue(deviceIdx).add(transaction);
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs the actions of the given transaction as soon as possible,
|
||||
* that is, before any other queued transactions, but after the actions
|
||||
* of the currently executing transaction.
|
||||
*/
|
||||
public void performImmediately(TransactionBuilder builder, int deviceIdx) throws IOException {
|
||||
if (!isConnected()) {
|
||||
throw new IOException("Not connected to device: " + getDevice());
|
||||
}
|
||||
getQueue(deviceIdx).insert(builder.getTransaction());
|
||||
}
|
||||
|
||||
/**
|
||||
* Subclasses should call this method to add services they support.
|
||||
* Only supported services will be queried for characteristics.
|
||||
*
|
||||
* @param aSupportedService supported service uuid
|
||||
* @see #getCharacteristic(UUID, int)
|
||||
*/
|
||||
protected void addSupportedService(UUID aSupportedService, int deviceIdx) {
|
||||
validateDeviceIndex(deviceIdx);
|
||||
mSupportedServices[deviceIdx].add(aSupportedService);
|
||||
}
|
||||
|
||||
protected void addSupportedProfile(AbstractBleProfile<?> profile) {
|
||||
mSupportedProfiles.add(profile);
|
||||
}
|
||||
|
||||
/**
|
||||
* Subclasses should call this method to add server services they support.
|
||||
*/
|
||||
protected void addSupportedServerService(BluetoothGattService service, int deviceIdx) {
|
||||
validateDeviceIndex(deviceIdx);
|
||||
mSupportedServerServices[deviceIdx].add(service);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the characteristic matching the given UUID. Only characteristics
|
||||
* are returned whose service is marked as supported.
|
||||
*
|
||||
* @param uuid characteristic uuid
|
||||
* @return the characteristic for the given UUID or <code>null</code>
|
||||
* @see #addSupportedService(UUID, int)
|
||||
*/
|
||||
public BluetoothGattCharacteristic getCharacteristic(UUID uuid, int deviceIdx) {
|
||||
validateDeviceIndex(deviceIdx);
|
||||
|
||||
synchronized (characteristicsMonitor) {
|
||||
if (mAvailableCharacteristics[deviceIdx] == null) {
|
||||
return null;
|
||||
}
|
||||
return mAvailableCharacteristics[deviceIdx].get(uuid);
|
||||
}
|
||||
}
|
||||
|
||||
private void gattServicesDiscovered(List<BluetoothGattService> discoveredGattServices,
|
||||
int deviceIdx) {
|
||||
if (discoveredGattServices == null) {
|
||||
logger.warn("No gatt services discovered: null!");
|
||||
return;
|
||||
}
|
||||
|
||||
Set<UUID> supportedServices = getSupportedServices(deviceIdx);
|
||||
Map<UUID, BluetoothGattCharacteristic> newCharacteristics = new HashMap<>();
|
||||
for (BluetoothGattService service : discoveredGattServices) {
|
||||
for (BleIntentApi bleApi : bleApis) {
|
||||
if (bleApi != null) {
|
||||
bleApi.addService(service);
|
||||
}
|
||||
}
|
||||
|
||||
if (supportedServices.contains(service.getUuid())) {
|
||||
logger.debug("discovered supported service: {}: {}",
|
||||
BleNamesResolver.resolveServiceName(service.getUuid().toString()),
|
||||
service.getUuid());
|
||||
List<BluetoothGattCharacteristic> characteristics = service.getCharacteristics();
|
||||
if (characteristics == null || characteristics.isEmpty()) {
|
||||
logger.warn("Supported LE service {} did not return any characteristics",
|
||||
service.getUuid());
|
||||
continue;
|
||||
}
|
||||
HashMap<UUID, BluetoothGattCharacteristic> intmAvailableCharacteristics =
|
||||
new HashMap<>(characteristics.size());
|
||||
for (BluetoothGattCharacteristic characteristic : characteristics) {
|
||||
intmAvailableCharacteristics.put(characteristic.getUuid(), characteristic);
|
||||
logger.info(" characteristic: {}: {}",
|
||||
BleNamesResolver.resolveCharacteristicName(
|
||||
characteristic.getUuid().toString()),
|
||||
characteristic.getUuid());
|
||||
}
|
||||
newCharacteristics.putAll(intmAvailableCharacteristics);
|
||||
|
||||
synchronized (characteristicsMonitor) {
|
||||
mAvailableCharacteristics[deviceIdx] = newCharacteristics;
|
||||
}
|
||||
} else {
|
||||
logger.debug("discovered unsupported service: {}: {}",
|
||||
BleNamesResolver.resolveServiceName(service.getUuid().toString()),
|
||||
service.getUuid());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected Set<UUID> getSupportedServices(int deviceIdx) {
|
||||
validateDeviceIndex(deviceIdx);
|
||||
return mSupportedServices[deviceIdx];
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility method that may be used to log incoming messages when we don't know how to deal with them yet.
|
||||
*/
|
||||
public void logMessageContent(byte[] value) {
|
||||
logger.info("RECEIVED DATA WITH LENGTH: {}", (value != null) ? value.length : "(null)");
|
||||
Logging.logBytes(logger, value);
|
||||
}
|
||||
|
||||
// default implementations of event handler methods (gatt callbacks)
|
||||
@Override
|
||||
public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
|
||||
for (AbstractBleProfile<?> profile : mSupportedProfiles) {
|
||||
profile.onConnectionStateChange(gatt, status, newState);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onServicesDiscovered(BluetoothGatt gatt) {
|
||||
int deviceIdx = getDeviceIndexForAddress(gatt.getDevice().getAddress());
|
||||
gattServicesDiscovered(gatt.getServices(), deviceIdx);
|
||||
|
||||
if (getDevice(deviceIdx).getState().compareTo(GBDevice.State.INITIALIZING) >= 0) {
|
||||
logger.warn(
|
||||
"Services discovered, but device {} ({}) is already in state {}, so ignoring",
|
||||
getDevice(deviceIdx), deviceIdx, getDevice(deviceIdx).getState());
|
||||
return;
|
||||
}
|
||||
TransactionBuilder builder = createTransactionBuilder("Initializing device_" + deviceIdx);
|
||||
|
||||
if (bleApis[deviceIdx] != null) {
|
||||
bleApis[deviceIdx].initializeDevice(builder);
|
||||
}
|
||||
|
||||
initializeDevice(builder, deviceIdx).queue(getQueue(deviceIdx));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCharacteristicRead(BluetoothGatt gatt,
|
||||
BluetoothGattCharacteristic characteristic, int status) {
|
||||
|
||||
int deviceIdx = getDeviceIndexForAddress(gatt.getDevice().getAddress());
|
||||
if (bleApis[deviceIdx] != null) {
|
||||
bleApis[deviceIdx].onCharacteristicChanged(characteristic);
|
||||
}
|
||||
|
||||
for (AbstractBleProfile<?> profile : mSupportedProfiles) {
|
||||
if (profile.onCharacteristicRead(gatt, characteristic, status)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCharacteristicWrite(BluetoothGatt gatt,
|
||||
BluetoothGattCharacteristic characteristic, int status) {
|
||||
for (AbstractBleProfile<?> profile : mSupportedProfiles) {
|
||||
if (profile.onCharacteristicWrite(gatt, characteristic, status)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor,
|
||||
int status) {
|
||||
for (AbstractBleProfile<?> profile : mSupportedProfiles) {
|
||||
if (profile.onDescriptorRead(gatt, descriptor, status)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor,
|
||||
int status) {
|
||||
for (AbstractBleProfile<?> profile : mSupportedProfiles) {
|
||||
if (profile.onDescriptorWrite(gatt, descriptor, status)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCharacteristicChanged(BluetoothGatt gatt,
|
||||
BluetoothGattCharacteristic characteristic) {
|
||||
int deviceIdx = getDeviceIndexForAddress(gatt.getDevice().getAddress());
|
||||
if (bleApis[deviceIdx] != null) {
|
||||
bleApis[deviceIdx].onCharacteristicChanged(characteristic);
|
||||
}
|
||||
|
||||
for (AbstractBleProfile<?> profile : mSupportedProfiles) {
|
||||
if (profile.onCharacteristicChanged(gatt, characteristic)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
|
||||
for (AbstractBleProfile<?> profile : mSupportedProfiles) {
|
||||
profile.onReadRemoteRssi(gatt, rssi, status);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
|
||||
int deviceIdx = getDeviceIndexForAddress(gatt.getDevice().getAddress());
|
||||
mMTUs[deviceIdx] = mtu;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConnectionStateChange(BluetoothDevice device, int status, int newState) {}
|
||||
|
||||
@Override
|
||||
public boolean onCharacteristicReadRequest(BluetoothDevice device, int requestId, int offset,
|
||||
BluetoothGattCharacteristic characteristic) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCharacteristicWriteRequest(BluetoothDevice device, int requestId,
|
||||
BluetoothGattCharacteristic characteristic,
|
||||
boolean preparedWrite, boolean responseNeeded,
|
||||
int offset, byte[] value) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onDescriptorReadRequest(BluetoothDevice device, int requestId, int offset,
|
||||
BluetoothGattDescriptor descriptor) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onDescriptorWriteRequest(BluetoothDevice device, int requestId,
|
||||
BluetoothGattDescriptor descriptor,
|
||||
boolean preparedWrite, boolean responseNeeded,
|
||||
int offset, byte[] value) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the current MTU, or 0 if unknown
|
||||
*
|
||||
* @return the current MTU, 0 if unknown
|
||||
*/
|
||||
public int getMTU(int deviceIdx) {
|
||||
validateDeviceIndex(deviceIdx);
|
||||
return mMTUs[deviceIdx];
|
||||
}
|
||||
}
|
||||
@@ -138,8 +138,8 @@ public class BondingUtil {
|
||||
new Handler(mainLooper).postDelayed(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
GBApplication.deviceService().disconnect();
|
||||
GBDevice device = DeviceHelper.getInstance().toSupportedDevice(candidate);
|
||||
GBApplication.deviceService(device).disconnect();
|
||||
connectToGBDevice(device);
|
||||
}
|
||||
}, DELAY_AFTER_BONDING);
|
||||
|
||||
@@ -50,12 +50,9 @@ import nodomain.freeyourgadget.gadgetbridge.R;
|
||||
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
|
||||
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
|
||||
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
|
||||
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.Device;
|
||||
import nodomain.freeyourgadget.gadgetbridge.entities.DeviceAttributes;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
|
||||
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
|
||||
import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
|
||||
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
|
||||
|
||||
public class DeviceHelper {
|
||||
@@ -180,23 +177,7 @@ public class DeviceHelper {
|
||||
*/
|
||||
public GBDevice toGBDevice(Device dbDevice) {
|
||||
DeviceType deviceType = DeviceType.fromName(dbDevice.getTypeName());
|
||||
GBDevice gbDevice = new GBDevice(dbDevice.getIdentifier(), dbDevice.getName(), dbDevice.getAlias(), dbDevice.getParentFolder(), deviceType);
|
||||
DeviceCoordinator coordinator = gbDevice.getDeviceCoordinator();
|
||||
for (BatteryConfig batteryConfig : coordinator.getBatteryConfig(gbDevice)) {
|
||||
gbDevice.setBatteryIcon(batteryConfig.getBatteryIcon(), batteryConfig.getBatteryIndex());
|
||||
gbDevice.setBatteryLabel(batteryConfig.getBatteryLabel(), batteryConfig.getBatteryIndex());
|
||||
}
|
||||
|
||||
List<DeviceAttributes> deviceAttributesList = dbDevice.getDeviceAttributesList();
|
||||
if (deviceAttributesList.size() > 0) {
|
||||
gbDevice.setModel(dbDevice.getModel());
|
||||
DeviceAttributes attrs = deviceAttributesList.get(0);
|
||||
gbDevice.setFirmwareVersion(attrs.getFirmwareVersion1());
|
||||
gbDevice.setFirmwareVersion2(attrs.getFirmwareVersion2());
|
||||
gbDevice.setVolatileAddress(attrs.getVolatileIdentifier());
|
||||
}
|
||||
|
||||
return gbDevice;
|
||||
return deviceType.getDeviceCoordinator().createDevice(dbDevice, deviceType);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user