projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Device: add support for list of discrete values for probe factor
[pulseview.git]
/
pv
/
binding
/
device.cpp
diff --git
a/pv/binding/device.cpp
b/pv/binding/device.cpp
index 32edea164144786d0ef9ad8aeab525dc99363eb8..521177ad4bfd3f7fb64a70d9c5f66fd726050aec 100644
(file)
--- a/
pv/binding/device.cpp
+++ b/
pv/binding/device.cpp
@@
-56,11
+56,12
@@
namespace binding {
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
configurable_(configurable)
{
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
configurable_(configurable)
{
- assert(configurable);
- for (auto entry : configurable->config_keys(ConfigKey::DEVICE_OPTIONS)) {
- auto key = entry.first;
- auto capabilities = entry.second;
+ auto keys = configurable->config_keys();
+
+ for (auto key : keys) {
+
+ auto capabilities = configurable->config_capabilities(key);
if (!capabilities.count(Capability::GET) ||
!capabilities.count(Capability::SET))
if (!capabilities.count(Capability::GET) ||
!capabilities.count(Capability::SET))
@@
-82,8
+83,7
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
config_changed();
};
config_changed();
};
- switch (key->id())
- {
+ switch (key->id()) {
case SR_CONF_SAMPLERATE:
// Sample rate values are not bound because they are shown
// in the MainBar
case SR_CONF_SAMPLERATE:
// Sample rate values are not bound because they are shown
// in the MainBar
@@
-98,12
+98,12
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
case SR_CONF_BUFFERSIZE:
case SR_CONF_TRIGGER_SOURCE:
case SR_CONF_TRIGGER_SLOPE:
case SR_CONF_BUFFERSIZE:
case SR_CONF_TRIGGER_SOURCE:
case SR_CONF_TRIGGER_SLOPE:
- case SR_CONF_FILTER:
case SR_CONF_COUPLING:
case SR_CONF_CLOCK_EDGE:
bind_enum(name, key, capabilities, get, set);
break;
case SR_CONF_COUPLING:
case SR_CONF_CLOCK_EDGE:
bind_enum(name, key, capabilities, get, set);
break;
+ case SR_CONF_FILTER:
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
case SR_CONF_POWER_OFF:
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
case SR_CONF_POWER_OFF:
@@
-123,7
+123,10
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
break;
case SR_CONF_PROBE_FACTOR:
break;
case SR_CONF_PROBE_FACTOR:
- bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
+ if (capabilities.count(Capability::LIST))
+ bind_enum(name, key, capabilities, get, set, print_probe_factor);
+ else
+ bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
break;
default:
break;
default:
@@
-141,7
+144,7
@@
void Device::bind_bool(const QString &name,
}
void Device::bind_enum(const QString &name,
}
void Device::bind_enum(const QString &name,
- const ConfigKey *key, std::set<
Capability
> capabilities,
+ const ConfigKey *key, std::set<
const Capability *
> capabilities,
Property::Getter getter,
Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
Property::Getter getter,
Property::Setter setter, function<QString (Glib::VariantBase)> printer)
{
@@
-192,5
+195,12
@@
QString Device::print_voltage_threshold(Glib::VariantBase gvar)
return QString("L<%1V H>%2V").arg(lo, 0, 'f', 1).arg(hi, 0, 'f', 1);
}
return QString("L<%1V H>%2V").arg(lo, 0, 'f', 1).arg(hi, 0, 'f', 1);
}
+QString Device::print_probe_factor(Glib::VariantBase gvar)
+{
+ uint64_t factor;
+ factor = g_variant_get_uint64(gvar.gobj());
+ return QString("%1x").arg(factor);
+}
+
} // binding
} // pv
} // binding
} // pv