DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
_sdi(sdi)
{
+ assert(sdi);
+
GVariant *gvar_opts, *gvar_list;
gsize num_opts;
- if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts, sdi) != SR_OK))
+ if ((sr_config_list(sdi->driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS,
+ &gvar_opts) != SR_OK))
/* Driver supports no device instance options. */
return;
const int key = info->key;
- if(sr_config_list(_sdi->driver, key, &gvar_list, _sdi) != SR_OK)
+ if (sr_config_list(_sdi->driver, _sdi, NULL, key, &gvar_list) != SR_OK)
gvar_list = NULL;
const QString name(info->name);
break;
case SR_CONF_CAPTURE_RATIO:
- bind_int(name, key, "%", make_pair(0L, 100L));
+ bind_int(name, key, "%", pair<int64_t, int64_t>(0, 100));
break;
case SR_CONF_PATTERN_MODE:
case SR_CONF_VDIV:
bind_enum(name, key, gvar_list, print_vdiv);
break;
+
+ case SR_CONF_VOLTAGE_THRESHOLD:
+ bind_enum(name, key, gvar_list, print_voltage_threshold);
+ break;
}
if (gvar_list)
const struct sr_dev_inst *sdi, int key)
{
GVariant *data = NULL;
- if (sr_config_get(sdi->driver, key, &data, sdi) != SR_OK) {
+ if (sr_config_get(sdi->driver, sdi, NULL, key, &data) != SR_OK) {
qDebug() <<
"WARNING: Failed to get value of config id" << key;
return NULL;
void DeviceOptions::config_setter(
const struct sr_dev_inst *sdi, int key, GVariant* value)
{
- if (sr_config_set(sdi, key, value) != SR_OK)
+ if (sr_config_set(sdi, NULL, key, value) != SR_OK)
qDebug() << "WARNING: Failed to set value of sample rate";
}
return QString(sr_voltage_string(p, q));
}
+QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
+{
+ gdouble lo, hi;
+ char buf[64];
+ g_variant_get(gvar, "(dd)", &lo, &hi);
+ snprintf(buf, sizeof(buf), "L<%.1fV H>%.1fV", lo, hi);
+ return QString(buf);
+}
+
} // binding
} // prop
} // pv