Others/CHIP_IO
1
0
Fork 0
mirror of https://github.com/xtacocorex/CHIP_IO synced 2025-07-20 04:43:21 +00:00
Code Issues Releases Activity

implementation and close #75 - enabling a timeout for the wait_for_edge function

Browse Source
This commit is contained in:
Robert Wolterman
2017-09-03 21:43:59 -05:00
parent a0b2ac12a6
commit e3a077bf82
8 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/py_gpio.c
View File

@ -817,18 +817,19 @@ static PyObject *py_event_detected(PyObject *self, PyObject *args)
Py_RETURN_FALSE;
}
// python function py_wait_for_edge(gpio, edge)
// python function py_wait_for_edge(gpio, edge, timeout = -1)
static PyObject *py_wait_for_edge(PyObject *self, PyObject *args)
{
int gpio;
int edge, result;
int edge, result, timeout;
char *channel;
char error[81];
int allowed = -1;
clear_error_msg();
if (!PyArg_ParseTuple(args, "si", &channel, &edge))
timeout = -1;
if (!PyArg_ParseTuple(args, "si|i", &channel, &edge, &timeout))
return NULL;
if (get_gpio_number(channel, &gpio)) {
@ -877,7 +878,7 @@ static PyObject *py_wait_for_edge(PyObject *self, PyObject *args)
}
Py_BEGIN_ALLOW_THREADS // disable GIL
result = blocking_wait_for_edge(gpio, edge);
result = blocking_wait_for_edge(gpio, edge, timeout);
Py_END_ALLOW_THREADS // enable GIL
if (result == 0) {
@ -1179,7 +1180,7 @@ PyMethodDef gpio_methods[] = {
{"remove_event_detect", py_remove_event_detect, METH_VARARGS, "Remove edge detection for a particular GPIO channel\ngpio - gpio channel"},
{"event_detected", py_event_detected, METH_VARARGS, "Returns True if an edge has occured on a given GPIO. You need to enable edge detection using add_event_detect() first.\ngpio - gpio channel"},
{"add_event_callback", (PyCFunction)py_add_event_callback, METH_VARARGS | METH_KEYWORDS, "Add a callback for an event already defined using add_event_detect()\ngpio - gpio channel\ncallback - a callback function\n[bouncetime] - Switch bounce timeout in ms"},
{"wait_for_edge", py_wait_for_edge, METH_VARARGS, "Wait for an edge.\ngpio - gpio channel\nedge - RISING, FALLING or BOTH"},
{"wait_for_edge", py_wait_for_edge, METH_VARARGS, "Wait for an edge.\ngpio - gpio channel\nedge - RISING, FALLING or BOTH\ntimeout (optional) - time to wait in miliseconds. -1 will wait forever (default)"},
{"gpio_function", py_gpio_function, METH_VARARGS, "Return the current GPIO function (IN, OUT, ALT0)\ngpio - gpio channel"},
{"setwarnings", py_setwarnings, METH_VARARGS, "Enable or disable warning messages"},
{"get_gpio_base", py_gpio_base, METH_VARARGS, "Get the XIO base number for sysfs"},