BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

python bindings: Support passing in rational voltages for config_set

This commit is contained in:
Richard Allen 2021-01-26 00:27:09 -06:00 committed by Soeren Apel
parent 1145ceaa78
commit a2916ad017
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bindings/python/sigrok/core/classes.i
View File

@ -340,8 +340,15 @@ Glib::VariantBase python_to_variant_by_key(PyObject *input, const sigrok::Config
return Glib::Variant<double>::create(PyFloat_AsDouble(input));
else if (type == SR_T_INT32 && PyInt_Check(input))
return Glib::Variant<gint32>::create(PyInt_AsLong(input));
else
throw sigrok::Error(SR_ERR_ARG);
else if ((type == SR_T_RATIONAL_VOLT) && PyTuple_Check(input) && (PyTuple_Size(input) == 2)) {
PyObject *numObj = PyTuple_GetItem(input, 0);
PyObject *denomObj = PyTuple_GetItem(input, 1);
if ((PyInt_Check(numObj) || PyLong_Check(numObj)) && (PyInt_Check(denomObj) || PyLong_Check(denomObj))) {
std::tuple<guint64, guint64> tpl = {PyInt_AsLong(numObj), PyInt_AsLong(denomObj)};
return Glib::Variant< std::tuple<guint64,guint64> >::Variant::create(tpl);
}
}
throw sigrok::Error(SR_ERR_ARG);
}
/* Convert from a Python type to Glib::Variant, according to Option data type. */