projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #685 by adding a special T marker when SR_DT_TRIGGER arrives
[pulseview.git]
/
pv
/
dialogs
/
connect.cpp
diff --git
a/pv/dialogs/connect.cpp
b/pv/dialogs/connect.cpp
index 20836901b006a981cebb107d88054e51ef98a899..5baedcbcacaa1a2e06c52050419f5c77158b906d 100644
(file)
--- a/
pv/dialogs/connect.cpp
+++ b/
pv/dialogs/connect.cpp
@@
-108,7
+108,7
@@
void Connect::populate_drivers()
*/
bool supported_device = driver->config_check(
ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) |
*/
bool supported_device = driver->config_check(
ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) |
- driver->config_check(
+ driver->config_check(
ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS);
if (supported_device)
ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS);
if (supported_device)
@@
-177,7
+177,7
@@
void Connect::scan_pressed()
assert(device);
QString text = QString::fromStdString(
assert(device);
QString text = QString::fromStdString(
- device
_manager_.get_display_name(device
));
+ device
->display_name(device_manager_
));
text += QString(" with %1 channels").arg(
device->device()->channels().size());
text += QString(" with %1 channels").arg(
device->device()->channels().size());