]> sigrok.org Git - pulseview.git/commitdiff
connect: Fix filtering of supported devices.
authorAurelien Jacobs <redacted>
Thu, 4 Dec 2014 00:14:09 +0000 (01:14 +0100)
committerUwe Hermann <redacted>
Thu, 4 Dec 2014 13:14:09 +0000 (14:14 +0100)
Now that driver options are split from device options, it is not
possible to check the SAMPLERATE option on a driver as it is a device
only option. The SAMPLERATE test still works on some drivers that
didn't have their options split yet, but this won't hold true for long.
The proper way is to check the driver class, which is the only option
you can expect at the driver level for now.

pv/dialogs/connect.cpp

index 2700672af501e9456e4ed95ae391cfbea5dcdc33..f7b0fc76004b9bf7e95b09aff53371b0f7deb5ac 100644 (file)
@@ -104,7 +104,9 @@ void Connect::populate_drivers()
                 * and sensors.
                 */
                bool supported_device = driver->config_check(
-                       ConfigKey::SAMPLERATE, ConfigKey::DEVICE_OPTIONS);
+                       ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) |
+                                       driver->config_check(
+                       ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS);
 
                if (supported_device)
                        drivers_.addItem(QString("%1 (%2)").arg(