X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=ca8f66bee5316e6116d4fb38afcbdd93ca78a24d;hp=ac6ce6fb433da3fa29eefa9ba551c043c70f63b5;hb=8d054b91e39afd8e3b04cdde8e37f2c94aa2e608;hpb=941e22a645e89e7253f0faeb63b74ee97201dd91 diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index ac6ce6fb..ca8f66be 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -36,6 +36,7 @@ #include #include +#include using std::bind; using std::list; @@ -45,6 +46,7 @@ using std::placeholders::_2; using std::shared_ptr; using std::string; using std::unique_ptr; +using std::vector; using Glib::VariantBase; @@ -54,20 +56,47 @@ using sigrok::Driver; namespace pv { -DeviceManager::DeviceManager(shared_ptr context) : +DeviceManager::DeviceManager(shared_ptr context, + std::string driver, bool do_scan) : context_(context) { unique_ptr progress(new QProgressDialog("", - QObject::tr("Cancel"), 0, context->drivers().size())); + QObject::tr("Cancel"), 0, context->drivers().size() + 1)); progress->setWindowModality(Qt::WindowModal); progress->setMinimumDuration(1); // To show the dialog immediately int entry_num = 1; + /* + * Check the presence of an optional user spec for device scans. + * Determine the driver name and options (in generic format) when + * applicable. + */ + std::string user_name; + vector user_opts; + if (!driver.empty()) { + user_opts = pv::util::split_string(driver, ":"); + user_name = user_opts.front(); + user_opts.erase(user_opts.begin()); + } + + /* + * Scan for devices. No specific options apply here, this is + * best effort auto detection. + */ for (auto entry : context->drivers()) { + if (!do_scan) + break; + + // Skip drivers we won't scan anyway + if (!driver_supported(entry.second)) + continue; + progress->setLabelText(QObject::tr("Scanning for %1...") .arg(QString::fromStdString(entry.first))); + if (entry.first == user_name) + continue; driver_scan(entry.second, map()); progress->setValue(entry_num++); @@ -75,6 +104,48 @@ DeviceManager::DeviceManager(shared_ptr context) : if (progress->wasCanceled()) break; } + + /* + * Optionally run another scan with potentially more specific + * options when requested by the user. This is motivated by + * several different uses: It can find devices that are not + * covered by the above auto detection (UART, TCP). It can + * prefer one out of multiple found devices, and have this + * device pre-selected for new sessions upon user's request. + */ + user_spec_device_.reset(); + if (!driver.empty()) { + shared_ptr scan_drv; + map scan_opts; + + /* + * Lookup the device driver name. + */ + map> drivers = context->drivers(); + auto entry = drivers.find(user_name); + scan_drv = (entry != drivers.end()) ? entry->second : nullptr; + + /* + * Convert generic string representation of options + * to the driver specific data types. + */ + if (scan_drv && !user_opts.empty()) { + auto drv_opts = scan_drv->scan_options(); + scan_opts = drive_scan_options(user_opts, drv_opts); + } + + /* + * Run another scan for the specified driver, passing + * user provided scan options this time. + */ + list< shared_ptr > found; + if (scan_drv) { + found = driver_scan(scan_drv, scan_opts); + if (!found.empty()) + user_spec_device_ = found.front(); + } + } + progress->setValue(entry_num++); } const shared_ptr& DeviceManager::context() const @@ -93,14 +164,67 @@ DeviceManager::devices() const return devices_; } -list< shared_ptr > -DeviceManager::driver_scan( - shared_ptr driver, map drvopts) +/** + * Get the device that was detected with user provided scan options. + */ +shared_ptr +DeviceManager::user_spec_device() const { - list< shared_ptr > driver_devices; + return user_spec_device_; +} - assert(driver); +/** + * Convert generic options to data types that are specific to Driver::scan(). + * + * @param[in] user_spec Vector of tokenized words, string format. + * @param[in] driver_opts Driver's scan options, result of Driver::scan_options(). + * + * @return Map of options suitable for Driver::scan(). + */ +map +DeviceManager::drive_scan_options(vector user_spec, + set driver_opts) +{ + map result; + + for (auto entry : user_spec) { + /* + * Split key=value specs. Accept entries without separator + * (for simplified boolean specifications). + */ + string key, val; + size_t pos = entry.find("="); + if (pos == std::string::npos) { + key = entry; + val = ""; + } else { + key = entry.substr(0, pos); + val = entry.substr(pos + 1); + } + + /* + * Skip user specifications that are not a member of the + * driver's set of supported options. Have the text format + * input spec converted to the required driver specific type. + */ + const ConfigKey *cfg; + try { + cfg = ConfigKey::get_by_identifier(key); + if (!cfg) + continue; + if (driver_opts.find(cfg) == driver_opts.end()) + continue; + } catch (...) { + continue; + } + result[cfg] = cfg->parse_string(val); + } + return result; +} + +bool DeviceManager::driver_supported(shared_ptr driver) const +{ /* * We currently only support devices that can deliver samples at * a fixed samplerate (i.e. oscilloscopes and logic analysers). @@ -108,9 +232,19 @@ DeviceManager::driver_scan( * @todo Add support for non-monotonic devices (DMMs, sensors, etc). */ const auto keys = driver->config_keys(); - bool supported_device = keys.count(ConfigKey::LOGIC_ANALYZER) | - keys.count(ConfigKey::OSCILLOSCOPE); - if (!supported_device) + + return keys.count(ConfigKey::LOGIC_ANALYZER) | keys.count(ConfigKey::OSCILLOSCOPE); +} + +list< shared_ptr > +DeviceManager::driver_scan( + shared_ptr driver, map drvopts) +{ + list< shared_ptr > driver_devices; + + assert(driver); + + if (!driver_supported(driver)) return driver_devices; // Remove any device instances from this driver from the device