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

Actually start using bits of the decoder framework.

Browse Source
This commit is contained in:
David Given
2022-02-21 22:02:28 +01:00
parent c6cef191a7
commit e14030e369
10 changed files with 78 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/usb/usbfinder.cc
View File

@@ -5,8 +5,11 @@
#include "fmt/format.h"
#include "usbfinder.h"
#include "greaseweazle.h"
#include "protocol.h"
#include "libusbp.hpp"
static const std::set<uint32_t> VALID_DEVICES = { GREASEWEAZLE_ID, FLUXENGINE_ID };
static const std::string get_serial_number(const libusbp::device& device)
{
try
@@ -21,8 +24,7 @@ static const std::string get_serial_number(const libusbp::device& device)
}
}
std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices(
const std::set<uint32_t>& ids)
std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices()
{
std::vector<std::unique_ptr<CandidateDevice>> candidates;
for (const auto& it : libusbp::list_connected_devices())
@@ -31,7 +33,7 @@ std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices(
candidate->device = it;
uint32_t id = (it.get_vendor_id() << 16) | it.get_product_id();
if (ids.find(id) != ids.end())
if (VALID_DEVICES.find(id) != VALID_DEVICES.end())
{
candidate->id = id;
candidate->serial = get_serial_number(it);