frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor device identifier

Browse Source
This commit is contained in:
LordGrey 2023-03-27 22:33:09 +00:00
parent c800235ef6
commit 1d6b620d88
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/leddevice/dev_ftdi/ProviderFtdi.cpp
View File

@ -174,6 +174,7 @@ QJsonObject ProviderFtdi::discover(const QJsonObject & /*params*/)
if (ftdi_usb_find_all(ftdic, &devlist, ANY_FTDI_VENDOR, ANY_FTDI_PRODUCT) > 0) if (ftdi_usb_find_all(ftdic, &devlist, ANY_FTDI_VENDOR, ANY_FTDI_PRODUCT) > 0)
{ {
struct ftdi_device_list *curdev = devlist; struct ftdi_device_list *curdev = devlist;
QMap<QString, uint8_t> deviceIndexes;
while (curdev) while (curdev)
{ {
char manufacturer[128], description[128]; char manufacturer[128], description[128];
@ -181,16 +182,15 @@ QJsonObject ProviderFtdi::discover(const QJsonObject & /*params*/)
libusb_device_descriptor desc; libusb_device_descriptor desc;
libusb_get_device_descriptor(curdev->dev, &desc); libusb_get_device_descriptor(curdev->dev, &desc);
uint8_t bus_number = libusb_get_bus_number(curdev->dev);
uint8_t device_address = libusb_get_device_address(curdev->dev);
QString portName = QString("d:%1/%2")
.arg(bus_number, 3, 10, QChar{'0'})
.arg(device_address, 3, 10, QChar{'0'});
QString vendorIdentifier = QString("0x%1").arg(desc.idVendor, 4, 16, QChar{'0'}); QString vendorIdentifier = QString("0x%1").arg(desc.idVendor, 4, 16, QChar{'0'});
QString productIdentifier = QString("0x%1").arg(desc.idProduct, 4, 16, QChar{'0'}); QString productIdentifier = QString("0x%1").arg(desc.idProduct, 4, 16, QChar{'0'});
QString vendorAndProduct = QString("i:%1:%2")
.arg(vendorIdentifier)
.arg(productIdentifier);
uint8_t deviceIndex = deviceIndexes.value(vendorAndProduct, 0);
QString portName = QString("%1:%2").arg(vendorAndProduct).arg(deviceIndex);
deviceList.push_back(QJsonObject{ deviceList.push_back(QJsonObject{
{"portName", portName}, {"portName", portName},
@ -201,6 +201,8 @@ QJsonObject ProviderFtdi::discover(const QJsonObject & /*params*/)
}); });
curdev = curdev->next; curdev = curdev->next;
deviceIndexes.insert(vendorAndProduct, deviceIndex + 1);
} }
} }