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

Forgot about the XIO checking in py_gpio.c for edge detection code.

Browse Source
This commit is contained in:
Robert Wolterman
2016-06-20 20:24:18 -05:00
committed by GitHub
parent 0f89ae462c
commit 409c803aa5
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/py_gpio.c
View File

@ -58,7 +58,7 @@ static int init_module(void)
{ {
int i; int i;
for (i=0; i<430; i++) for (i=0; i<1024; i++)
gpio_direction[i] = -1; gpio_direction[i] = -1;
module_setup = 1; module_setup = 1;
@ -113,7 +113,7 @@ static PyObject *py_setup_channel(PyObject *self, PyObject *args, PyObject *kwar
gpio_export(gpio); gpio_export(gpio);
gpio_set_direction(gpio, direction); gpio_set_direction(gpio, direction);
if (gpio < 408) { if (gpio < get_xio_base()) {
if (direction == OUTPUT) { if (direction == OUTPUT) {
gpio_set_value(gpio, initial); gpio_set_value(gpio, initial);
} else { } else {
@ -269,7 +269,9 @@ static PyObject *py_add_event_callback(PyObject *self, PyObject *args, PyObject
return NULL; return NULL;
// check to ensure gpio is one of the allowed pins // check to ensure gpio is one of the allowed pins
if (gpio != 35 && gpio != 193 && !(gpio <= 415 && gpio >= 408)) { // TODO: ERROR CHECKING ON THE RETURN OF get_xio_base()
int xiobase = get_xio_base();
if (gpio != 35 && gpio != 193 && !(gpio <= xiobase+7 && gpio >= xiobase)) {
PyErr_SetString(PyExc_RuntimeError, "Callbacks currently available on AP-EINT1, AP-EINT3, and XIO-P0 to XIO-P7 only"); PyErr_SetString(PyExc_RuntimeError, "Callbacks currently available on AP-EINT1, AP-EINT3, and XIO-P0 to XIO-P7 only");
return NULL; return NULL;
} }
@ -316,7 +318,9 @@ static PyObject *py_add_event_detect(PyObject *self, PyObject *args, PyObject *k
return NULL; return NULL;
// check to ensure gpio is one of the allowed pins // check to ensure gpio is one of the allowed pins
if (gpio != 35 && gpio != 193 && !(gpio <= 415 && gpio >= 408)) { // TODO: ERROR CHECKING ON THE RETURN OF get_xio_base()
int xiobase = get_xio_base();
if (gpio != 35 && gpio != 193 && !(gpio <= xiobase+7 && gpio >= xiobase)) {
PyErr_SetString(PyExc_RuntimeError, "Edge Detection currently available on AP-EINT1, AP-EINT3, and XIO-P0 to XIO-P7 only"); PyErr_SetString(PyExc_RuntimeError, "Edge Detection currently available on AP-EINT1, AP-EINT3, and XIO-P0 to XIO-P7 only");
return NULL; return NULL;
} }
@ -370,7 +374,9 @@ static PyObject *py_remove_event_detect(PyObject *self, PyObject *args)
return NULL; return NULL;
// check to ensure gpio is one of the allowed pins // check to ensure gpio is one of the allowed pins
if (gpio != 35 && gpio != 193 && !(gpio <= 415 && gpio >= 408)) { // TODO: ERROR CHECKING ON THE RETURN OF get_xio_base()
int xiobase = get_xio_base();
if (gpio != 35 && gpio != 193 && !(gpio <= xiobase+7 && gpio >= xiobase)) {
PyErr_SetString(PyExc_RuntimeError, "Edge Detection currently available on AP-EINT1, AP-EINT3, and XIO-P0 to XIO-P7 only"); PyErr_SetString(PyExc_RuntimeError, "Edge Detection currently available on AP-EINT1, AP-EINT3, and XIO-P0 to XIO-P7 only");
return NULL; return NULL;
} }
@ -432,7 +438,9 @@ static PyObject *py_wait_for_edge(PyObject *self, PyObject *args)
return NULL; return NULL;
// check to ensure gpio is one of the allowed pins // check to ensure gpio is one of the allowed pins
if (gpio != 35 && gpio != 193 && !(gpio <= 415 && gpio >= 408)) { // TODO: ERROR CHECKING ON THE RETURN OF get_xio_base()
int xiobase = get_xio_base();
if (gpio != 35 && gpio != 193 && !(gpio <= xiobase+7 && gpio >= xiobase)) {
PyErr_SetString(PyExc_RuntimeError, "Edge Detection currently available on AP-EINT1, AP-EINT3, and XIO-P0 to XIO-P7 only"); PyErr_SetString(PyExc_RuntimeError, "Edge Detection currently available on AP-EINT1, AP-EINT3, and XIO-P0 to XIO-P7 only");
return NULL; return NULL;
} }