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

Remove auto discovery

Browse Source
This commit is contained in:
LordGrey 2023-03-26 18:38:24 +00:00
parent e6f6954f1a
commit d5dc60db31
1 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,35 +54,8 @@ int ProviderFtdi::openDevice()
{ {
_ftdic = ftdi_new(); _ftdic = ftdi_new();
bool autoDiscovery = (QString::compare(_deviceName, ProviderFtdi::AUTO_SETTING, Qt::CaseInsensitive) == 0); Debug(_log, "Opening FTDI device=%s", QSTRING_CSTR(_deviceName));
Debug(_log, "Opening FTDI device=%s autoDiscovery=%s", QSTRING_CSTR(_deviceName), autoDiscovery ? "true" : "false");
if (autoDiscovery)
{
struct ftdi_device_list *devlist;
int devicesDetected = 0;
if ((devicesDetected = ftdi_usb_find_all(_ftdic, &devlist, ANY_FTDI_VENDOR, ANY_FTDI_PRODUCT)) < 0)
{
setInError(ftdi_get_error_string(_ftdic));
return -1;
}
if (devicesDetected == 0)
{
setInError("No ftdi devices detected");
return 0;
}
if (ftdi_usb_open_dev(_ftdic, devlist[0].dev) < 0)
{
setInError(ftdi_get_error_string(_ftdic));
ftdi_list_free(&devlist);
return -1;
}
ftdi_list_free(&devlist);
return 1;
}
else
{
if (ftdi_usb_open_string(_ftdic, QSTRING_CSTR(_deviceName)) < 0) if (ftdi_usb_open_string(_ftdic, QSTRING_CSTR(_deviceName)) < 0)
{ {
setInError(ftdi_get_error_string(_ftdic)); setInError(ftdi_get_error_string(_ftdic));
@ -90,7 +63,6 @@ int ProviderFtdi::openDevice()
} }
return 1; return 1;
} }
}
int ProviderFtdi::open() int ProviderFtdi::open()
{ {
int rc = 0; int rc = 0;
@ -208,9 +180,6 @@ QJsonObject ProviderFtdi::discover(const QJsonObject & /*params*/)
struct ftdi_device_list *devlist; struct ftdi_device_list *devlist;
struct ftdi_context *ftdic; struct ftdi_context *ftdic;
QJsonObject autoDevice = QJsonObject{{"value", AUTO_SETTING}, {"name", "Auto"}};
deviceList.push_back(autoDevice);
ftdic = ftdi_new(); ftdic = ftdi_new();
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)