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

GreaseWeazle autodetection now works (at least on Linux).

Browse Source
This commit is contained in:
David Given
2021-12-13 23:09:33 +01:00
parent 462bd9ae5e
commit 3dfafaa278
5 changed files with 66 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/usb/usbfinder.cc
View File

@@ -4,6 +4,7 @@
#include "bytes.h"
#include "fmt/format.h"
#include "usbfinder.h"
#include "greaseweazle.h"
#include "libusbp.hpp"
static const std::string get_serial_number(const libusbp::device& device)
@@ -20,7 +21,7 @@ static const std::string get_serial_number(const libusbp::device& device)
}
}
std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices(uint32_t candidateId)
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())
@@ -29,10 +30,17 @@ std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices(uint32_t candidateI
candidate->device = it;
uint32_t id = (it.get_vendor_id() << 16) | it.get_product_id();
if (id == candidateId)
if (ids.contains(id))
{
candidate->id = candidateId;
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));
}
}