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

android/usb: guess the actual manufacturer and product

Browse source 
For a small number of dive computers we can actually figure out the
real information which we can then later show to the user.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-03-14 17:12:52 -07:00
parent d953c645e9
commit c2077992ff
2 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
core/serial_usb_android.cpp
View file

@ -204,6 +204,35 @@ dc_status_t serial_usb_android_open(dc_iostream_t **iostream, dc_context_t *cont
return dc_custom_open(iostream, context, DC_TRANSPORT_SERIAL, &callbacks, device); return dc_custom_open(iostream, context, DC_TRANSPORT_SERIAL, &callbacks, device);
} }
static void guessVendorProduct(android_usb_serial_device_descriptor &descriptor)
{
// for a couple of devices we get enough information that we can guess which dive computer this is
QString product = QString::fromStdString(descriptor.usbProduct);
int vid = descriptor.vid;
int pid = descriptor.pid;
if (product.contains("HeinrichsWeikamp OSTC3")) {
descriptor.manufacturer = "Heinrichs Weikamp";
descriptor.product = "OSTC 3";
} else if (product.contains("HeinrichsWeikamp OSTC 2N")) {
descriptor.manufacturer = "Heinrichs Weikamp";
descriptor.product = "OSTC 2N";
} else if (vid == 0x0403 && pid == 0xf460) {
// some form of Oceanic
descriptor.manufacturer = "Oceanic";
} else if (vid == 0x0403 && pid == 0xf680) {
// some form of Suunto
descriptor.manufacturer = "Suunto";
} else if (vid == 0x0403 && pid == 0x87d0) {
// some form of Cressi
descriptor.manufacturer = "Cressi";
} else if (vid == 0xffff && pid == 0x0005) {
// Mares Icon HD
descriptor.manufacturer = "Mares";
descriptor.product = "Icon HD";
}
}
android_usb_serial_device_descriptor getDescriptor(QAndroidJniObject usbDevice) android_usb_serial_device_descriptor getDescriptor(QAndroidJniObject usbDevice)
{ {
QAndroidJniEnvironment env; QAndroidJniEnvironment env;
@ -218,7 +247,7 @@ android_usb_serial_device_descriptor getDescriptor(QAndroidJniObject usbDevice)
QAndroidJniObject usbManufacturerName = usbDevice.callObjectMethod<jstring>("getManufacturerName"); QAndroidJniObject usbManufacturerName = usbDevice.callObjectMethod<jstring>("getManufacturerName");
if (usbManufacturerName.isValid()) { if (usbManufacturerName.isValid()) {
const char *charArray = env->GetStringUTFChars(usbManufacturerName.object<jstring>(), nullptr); const char *charArray = env->GetStringUTFChars(usbManufacturerName.object<jstring>(), nullptr);
descriptor.manufacturer = std::string(charArray); descriptor.usbManufacturer = std::string(charArray);
env->ReleaseStringUTFChars(usbManufacturerName.object<jstring>(), charArray); env->ReleaseStringUTFChars(usbManufacturerName.object<jstring>(), charArray);
} }
@ -226,10 +255,13 @@ android_usb_serial_device_descriptor getDescriptor(QAndroidJniObject usbDevice)
QAndroidJniObject usbProductName = usbDevice.callObjectMethod<jstring>("getProductName"); QAndroidJniObject usbProductName = usbDevice.callObjectMethod<jstring>("getProductName");
if (usbManufacturerName.isValid()) { if (usbManufacturerName.isValid()) {
const char *charArray = env->GetStringUTFChars(usbProductName.object<jstring>(), nullptr); const char *charArray = env->GetStringUTFChars(usbProductName.object<jstring>(), nullptr);
descriptor.product = std::string(charArray); descriptor.usbProduct = std::string(charArray);
env->ReleaseStringUTFChars(usbProductName.object<jstring>(), charArray); env->ReleaseStringUTFChars(usbProductName.object<jstring>(), charArray);
} }
// guess the actual manufacturer / product if we happen to be able to guess
guessVendorProduct(descriptor);
// Get busnum and portnum // Get busnum and portnum
QAndroidJniObject usbDeviceNameString = usbDevice.callObjectMethod<jstring>("getDeviceName"); QAndroidJniObject usbDeviceNameString = usbDevice.callObjectMethod<jstring>("getDeviceName");
const char *charArray = env->GetStringUTFChars(usbDeviceNameString.object<jstring>(), nullptr); const char *charArray = env->GetStringUTFChars(usbDeviceNameString.object<jstring>(), nullptr);
@ -241,12 +273,15 @@ android_usb_serial_device_descriptor getDescriptor(QAndroidJniObject usbDevice)
// The ui representation // The ui representation
char buffer[128]; char buffer[128];
if (descriptor.manufacturer.empty()) { if (!descriptor.manufacturer.empty()) {
sprintf(buffer, "USB Device [%i:%i]", busnum, portnum); // Heinrichs Weikamp is the longest, so let's just take the name
} else if (descriptor.manufacturer.size() <= 16) {
sprintf(buffer, "%s [%i:%i]", descriptor.manufacturer.c_str(), busnum, portnum); sprintf(buffer, "%s [%i:%i]", descriptor.manufacturer.c_str(), busnum, portnum);
} else if (descriptor.usbManufacturer.empty()) {
sprintf(buffer, "USB Device [%i:%i]", busnum, portnum);
} else if (descriptor.usbManufacturer.size() <= 16) {
sprintf(buffer, "%s [%i:%i]", descriptor.usbManufacturer.c_str(), busnum, portnum);
} else { } else {
sprintf(buffer, "%.16s… [%i:%i]", descriptor.manufacturer.c_str(), busnum, portnum); sprintf(buffer, "%.16s… [%i:%i]", descriptor.usbManufacturer.c_str(), busnum, portnum);
} }
descriptor.uiRepresentation = buffer; descriptor.uiRepresentation = buffer;

2
core/serial_usb_android.h
View file

@ -11,6 +11,8 @@ struct android_usb_serial_device_descriptor {
std::string uiRepresentation; /* The string that can be used for the user interface. */ std::string uiRepresentation; /* The string that can be used for the user interface. */
// Device information // Device information
std::string usbManufacturer;
std::string usbProduct;
std::string manufacturer; std::string manufacturer;
std::string product; std::string product;
uint16_t pid; uint16_t pid;