mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use SSRF_CUSTOM_IO v2 to implement device data quirks for BLE GATT

Browse source 
Right now we have a quirk for Shearwater devices to set the random
address flag, but also to handle the differences at read/write time.

With this, I can finally download from both the Suunto EON Steel and the
Shearwater Perdix AI with the same binary.

It's not *pretty*, but it works.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2017-06-27 15:14:27 -07:00
parent d01b7bf891
commit 526595644f
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/qt-ble.cpp
View file

@ -80,9 +80,10 @@ void BLEObject::addService(const QBluetoothUuid &newService)
} }
} }
BLEObject::BLEObject(QLowEnergyController *c) BLEObject::BLEObject(QLowEnergyController *c, dc_user_device_t *d)
{ {
controller = c; controller = c;
device = d;
} }
BLEObject::~BLEObject() BLEObject::~BLEObject()
@ -90,7 +91,13 @@ BLEObject::~BLEObject()
qDebug() << "Deleting BLE object"; qDebug() << "Deleting BLE object";
} }
dc_status_t BLEObject::write(const void* data, size_t size, size_t *actual) /* Yeah, I could do the C++ inline member thing */
static int device_is_shearwater(dc_user_device_t *device)
{
return !strcmp(device->vendor, "Shearwater");
}
dc_status_t BLEObject::write(const void *data, size_t size, size_t *actual)
{ {
QList<QLowEnergyCharacteristic> list = preferredService()->characteristics(); QList<QLowEnergyCharacteristic> list = preferredService()->characteristics();
QByteArray bytes((const char *)data, (int) size); QByteArray bytes((const char *)data, (int) size);
@ -103,6 +110,9 @@ dc_status_t BLEObject::write(const void* data, size_t size, size_t *actual)
QLowEnergyService::WriteWithoutResponse : QLowEnergyService::WriteWithoutResponse :
QLowEnergyService::WriteWithResponse; QLowEnergyService::WriteWithResponse;
if (device_is_shearwater(device))
bytes.prepend("\1\0", 2);
preferredService()->writeCharacteristic(c, bytes, mode); preferredService()->writeCharacteristic(c, bytes, mode);
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
} }
@ -110,7 +120,7 @@ dc_status_t BLEObject::write(const void* data, size_t size, size_t *actual)
return DC_STATUS_IO; return DC_STATUS_IO;
} }
dc_status_t BLEObject::read(void* data, size_t size, size_t *actual) dc_status_t BLEObject::read(void *data, size_t size, size_t *actual)
{ {
if (receivedPackets.isEmpty()) { if (receivedPackets.isEmpty()) {
QList<QLowEnergyCharacteristic> list = preferredService()->characteristics(); QList<QLowEnergyCharacteristic> list = preferredService()->characteristics();
@ -133,6 +143,10 @@ dc_status_t BLEObject::read(void* data, size_t size, size_t *actual)
return DC_STATUS_IO; return DC_STATUS_IO;
QByteArray packet = receivedPackets.takeFirst(); QByteArray packet = receivedPackets.takeFirst();
if (device_is_shearwater(device))
packet.remove(0,2);
if (size > packet.size()) if (size > packet.size())
size = packet.size(); size = packet.size();
memcpy(data, packet.data(), size); memcpy(data, packet.data(), size);
@ -161,6 +175,9 @@ dc_status_t qt_ble_open(dc_custom_io_t *io, dc_context_t *context, const char *d
qDebug() << "qt_ble_open(" << devaddr << ")"; qDebug() << "qt_ble_open(" << devaddr << ")";
if (device_is_shearwater(io->user_device))
controller->setRemoteAddressType(QLowEnergyController::RandomAddress);
// Try to connect to the device // Try to connect to the device
controller->connectToDevice(); controller->connectToDevice();
@ -184,7 +201,7 @@ dc_status_t qt_ble_open(dc_custom_io_t *io, dc_context_t *context, const char *d
} }
/* We need to discover services etc here! */ /* We need to discover services etc here! */
BLEObject *ble = new BLEObject(controller); BLEObject *ble = new BLEObject(controller, io->user_device);
ble->connect(controller, SIGNAL(serviceDiscovered(QBluetoothUuid)), SLOT(addService(QBluetoothUuid))); ble->connect(controller, SIGNAL(serviceDiscovered(QBluetoothUuid)), SLOT(addService(QBluetoothUuid)));
qDebug() << " .. discovering services"; qDebug() << " .. discovering services";

3
core/qt-ble.h
View file

@ -11,7 +11,7 @@ class BLEObject : public QObject
Q_OBJECT Q_OBJECT
public: public:
BLEObject(QLowEnergyController *c); BLEObject(QLowEnergyController *c, dc_user_device_t *);
~BLEObject(); ~BLEObject();
dc_status_t write(const void* data, size_t size, size_t *actual); dc_status_t write(const void* data, size_t size, size_t *actual);
dc_status_t read(void* data, size_t size, size_t *actual); dc_status_t read(void* data, size_t size, size_t *actual);
@ -32,6 +32,7 @@ private:
QLowEnergyController *controller = nullptr; QLowEnergyController *controller = nullptr;
QList<QByteArray> receivedPackets; QList<QByteArray> receivedPackets;
QEventLoop waitForPacket; QEventLoop waitForPacket;
dc_user_device_t *device;
}; };