0.6.4.0

Pako2 · Jul 7, 2021 · 594de76 · 594de76
1 parent 622c282
commit 594de76
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/source/constants.c b/source/constants.c
@@ -98,7 +98,7 @@ void define_constants(PyObject *module)
 	bthree = Py_BuildValue("i", THREE);
 	PyModule_AddObject(module, "THREE", bthree);
 
-	version = Py_BuildValue("s", "0.6.3.1");
+	version = Py_BuildValue("s", "0.6.4.0");
 	PyModule_AddObject(module, "VERSION", version);
 
 	PyModule_AddObject(module, "PA", Py_BuildValue("i", 0));

diff --git a/source/py_gpio.c b/source/py_gpio.c
@@ -157,6 +157,23 @@ static PyObject *py_getmode(PyObject *self, PyObject *args)
    return value;
 }
 
+
+static unsigned int chan_from_gpio(unsigned int gpio)
+{
+   int chan;
+   int chans;
+
+   if (gpio_mode == BCM)
+      return gpio;
+   chans = 40;
+
+   for (chan=1; chan<=chans; chan++)
+      if (*(*pin_to_gpio+chan) == (int)gpio)
+         return chan;
+   return -1;
+}
+
+
 // python function setwarnings(state)
 static PyObject *py_setwarnings(PyObject *self, PyObject *args)
 {
@@ -419,7 +436,7 @@ static void run_py_callbacks(unsigned int gpio)
     if (cb->gpio == gpio) {
       // run callback
       gstate = PyGILState_Ensure();
-      result = PyObject_CallFunction(cb->py_cb, "i", gpio);
+      result = PyObject_CallFunction(cb->py_cb, "i", chan_from_gpio(gpio));
       if (result == NULL && PyErr_Occurred()){
         PyErr_Print();
         PyErr_Clear();