projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #599 by supplying correct length to create_logic_packet()
[pulseview.git]
/
pv
/
binding
/
device.cpp
diff --git
a/pv/binding/device.cpp
b/pv/binding/device.cpp
index 7547a46b341b33d3f472c2fce56812fa491fbe9c..6f9788932c8dd0d4377d98771cee69ad6b6760e3 100644
(file)
--- a/
pv/binding/device.cpp
+++ b/
pv/binding/device.cpp
@@
-56,9
+56,15
@@
namespace binding {
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
configurable_(configurable)
{
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
configurable_(configurable)
{
-
assert(configurable)
;
+
std::map< const ConfigKey*, std::set<Capability> > keys
;
- for (auto entry : configurable->config_keys(ConfigKey::DEVICE_OPTIONS)) {
+ try {
+ keys = configurable->config_keys(ConfigKey::DEVICE_OPTIONS);
+ } catch (const Error) {
+ return;
+ }
+
+ for (auto entry : keys) {
auto key = entry.first;
auto capabilities = entry.second;
auto key = entry.first;
auto capabilities = entry.second;
@@
-106,6
+112,7
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
+ case SR_CONF_POWER_OFF:
bind_bool(name, get, set);
break;
bind_bool(name, get, set);
break;
@@
-121,6
+128,10
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
bind_enum(name, key, capabilities, get, set, print_voltage_threshold);
break;
bind_enum(name, key, capabilities, get, set, print_voltage_threshold);
break;
+ case SR_CONF_PROBE_FACTOR:
+ bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
+ break;
+
default:
break;
}
default:
break;
}