X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=5920486a9d6d8df54f7bb8dc8135bc38ff1620a8;hb=4349dc21e726fe6e9e1fba59f9f06a9bdc718078;hp=17a49774465c3d90fa7c8e3171d10bd4900c33f1;hpb=3084ed4b15663dd717ff656745db305f377ab215;p=pulseview.git
diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 17a4977..5920486 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include "devicemanager.hpp"
@@ -23,28 +22,30 @@
#include
#include
-#include
+#include
#include
+#include
#include
-#include
#include
-#include
+#include
+#include
+#include
+
#include
#include
-
-using boost::algorithm::join;
+#include
using std::bind;
-using std::dynamic_pointer_cast;
using std::list;
using std::map;
-using std::remove_if;
-using std::runtime_error;
+using std::placeholders::_1;
+using std::placeholders::_2;
using std::shared_ptr;
using std::string;
+using std::unique_ptr;
using std::vector;
using Glib::VariantBase;
@@ -52,22 +53,97 @@ using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Context;
using sigrok::Driver;
-using sigrok::SessionDevice;
namespace pv {
-DeviceManager::DeviceManager(shared_ptr context) :
+DeviceManager::DeviceManager(shared_ptr context,
+ std::string driver, bool do_scan) :
context_(context)
{
- for (auto entry : context->drivers())
+ unique_ptr progress(new QProgressDialog("",
+ 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;
+ progress->setLabelText(QObject::tr("Scanning for %1...")
+ .arg(QString::fromStdString(entry.first)));
+
+ if (entry.first == user_name)
+ continue;
driver_scan(entry.second, map());
-}
-DeviceManager::~DeviceManager()
-{
+ progress->setValue(entry_num++);
+ QApplication::processEvents();
+ 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 std::shared_ptr& DeviceManager::context() const
+const shared_ptr& DeviceManager::context() const
{
return context_;
}
@@ -83,6 +159,65 @@ DeviceManager::devices() const
return devices_;
}
+/**
+ * Get the device that was detected with user provided scan options.
+ */
+shared_ptr
+DeviceManager::user_spec_device() const
+{
+ return user_spec_device_;
+}
+
+/**
+ * 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;
+}
+
list< shared_ptr >
DeviceManager::driver_scan(
shared_ptr driver, map drvopts)
@@ -91,6 +226,18 @@ DeviceManager::driver_scan(
assert(driver);
+ /*
+ * We currently only support devices that can deliver samples at
+ * a fixed samplerate (i.e. oscilloscopes and logic analysers).
+ *
+ * @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 driver_devices;
+
// Remove any device instances from this driver from the device
// list. They will not be valid after the scan.
devices_.remove_if([&](shared_ptr device) {
@@ -149,10 +296,12 @@ const shared_ptr DeviceManager::find_device_from_info(
// If present, vendor and model always have to match.
if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0)
- if (dev_info.at("vendor") != search_info.at("vendor")) continue;
+ if (dev_info.at("vendor") != search_info.at("vendor"))
+ continue;
if (dev_info.count("model") > 0 && search_info.count("model") > 0)
- if (dev_info.at("model") != search_info.at("model")) continue;
+ if (dev_info.at("model") != search_info.at("model"))
+ continue;
// Most unique match: vendor/model/serial_num (but don't match a S/N of 0)
if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0")
@@ -187,7 +336,8 @@ const shared_ptr DeviceManager::find_device_from_info(
}
bool DeviceManager::compare_devices(shared_ptr a,
- shared_ptr b) {
+ shared_ptr b)
+{
assert(a);
assert(b);
return a->display_name(*this).compare(b->display_name(*this)) < 0;