]> sigrok.org Git - libsigrok.git/commitdiff
python bindings: Support passing in rational voltages for config_set
authorRichard Allen <redacted>
Tue, 26 Jan 2021 06:27:09 +0000 (00:27 -0600)
committerSoeren Apel <redacted>
Sun, 21 Feb 2021 21:21:17 +0000 (22:21 +0100)
bindings/python/sigrok/core/classes.i

index 5c5cb3b31680303d2e45d2b073fbc16029a469b0..94913d0f65caa052065a122070d9b48939e0d65a 100644 (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. */