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

Change the global config variable to a globalConfig() function.

Browse Source
This commit is contained in:
dg
2023-05-10 22:07:17 +00:00
parent 24ff51274b
commit 9ba3f90f1e
43 changed files with 297 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/usb/usb.cc
View File

@@ -23,9 +23,9 @@ static std::shared_ptr<CandidateDevice> selectDevice()
"no devices found (is one plugged in? Do you have the "
"appropriate permissions?");
if (config.usb().has_serial())
if (globalConfig().usb().has_serial())
{
auto wantedSerial = config.usb().serial();
auto wantedSerial = globalConfig().usb().serial();
for (auto& c : candidates)
{
if (c->serial == wantedSerial)
@@ -63,10 +63,10 @@ USB* get_usb_impl()
{
/* Special case for certain configurations. */
if (config.usb().has_greaseweazle() &&
config.usb().greaseweazle().has_port())
if (globalConfig().usb().has_greaseweazle() &&
globalConfig().usb().greaseweazle().has_port())
{
const auto& conf = config.usb().greaseweazle();
const auto& conf = globalConfig().usb().greaseweazle();
log("Using GreaseWeazle on serial port {}", conf.port());
return createGreaseWeazleUsb(conf.port(), conf);
}
@@ -85,7 +85,7 @@ USB* get_usb_impl()
candidate->serial,
candidate->serialPort);
return createGreaseWeazleUsb(
candidate->serialPort, config.usb().greaseweazle());
candidate->serialPort, globalConfig().usb().greaseweazle());
default:
error("internal");