salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow specifying the GreaseWeazle serial port directly (for devices which don't

Browse Source 
have the GreaseWeazle VID/PID).
This commit is contained in:
David Given
2022-01-22 20:41:27 +01:00
parent d6db2128df
commit 745e0685a4
3 changed files with 102 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
lib/usb/usbfinder.cc
View File

@@ -9,66 +9,42 @@
static const std::string get_serial_number(const libusbp::device& device)
{
try
{
return device.get_serial_number();
}
catch (const libusbp::error& e)
{
if (e.has_code(LIBUSBP_ERROR_NO_SERIAL_NUMBER))
return "n/a";
throw;
}
try
{
return device.get_serial_number();
}
catch (const libusbp::error& e)
{
if (e.has_code(LIBUSBP_ERROR_NO_SERIAL_NUMBER))
return "n/a";
throw;
}
}
std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices(const std::set<uint32_t>& ids)
std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices(
const std::set<uint32_t>& ids)
{
std::vector<std::unique_ptr<CandidateDevice>> candidates;
for (const auto& it : libusbp::list_connected_devices())
{
auto candidate = std::make_unique<CandidateDevice>();
candidate->device = it;
std::vector<std::unique_ptr<CandidateDevice>> candidates;
for (const auto& it : libusbp::list_connected_devices())
{
auto candidate = std::make_unique<CandidateDevice>();
candidate->device = it;
uint32_t id = (it.get_vendor_id() << 16) | it.get_product_id();
if (ids.contains(id))
{
candidate->id = id;
candidate->serial = get_serial_number(it);
if (id == GREASEWEAZLE_ID)
{
libusbp::serial_port port(candidate->device);
candidate->serialPort = port.get_name();
}
candidates.push_back(std::move(candidate));
}
}
if (candidates.size() == 0) {
for (const auto& it : libusbp::list_connected_devices())
uint32_t id = (it.get_vendor_id() << 16) | it.get_product_id();
if (ids.contains(id))
{
auto candidate = std::make_unique<CandidateDevice>();
candidate->device = it;
uint32_t id = (it.get_vendor_id() << 16) | it.get_product_id();
candidate->id = id;
candidate->serial = get_serial_number(it);
printf("USB ID %04x %04x: ", it.get_vendor_id(), it.get_product_id());
try
candidate->id = id;
candidate->serial = get_serial_number(it);
if (id == GREASEWEAZLE_ID)
{
libusbp::serial_port port(candidate->device, 0, true);
candidate->serialPort = port.get_name();
printf("generic serialPort found\n");
candidates.push_back(std::move(candidate));
}
catch(const libusbp::error & error)
{
// not a serial port!
printf("not a port!\n");
continue;
libusbp::serial_port port(candidate->device);
candidate->serialPort = port.get_name();
}
}
}
return candidates;
candidates.push_back(std::move(candidate));
}
}
return candidates;
}