Merge branch 'master' into hotfix/hwpwmfix

source/c_softpwm.c

@@ -41,7 +41,6 @@ SOFTWARE.
 #include "c_pwm.h"
 #include "common.h"
 #include "event_gpio.h"
-#include "Python.h"
 
 #define KEYLEN 7
 

source/common.c

@@ -36,7 +36,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "Python.h"
 #include <dirent.h>
 #include <time.h>
 #include "common.h"

source/constants.c

@@ -76,6 +76,6 @@ void define_constants(PyObject *module)
    both_edge = Py_BuildValue("i", BOTH_EDGE);
    PyModule_AddObject(module, "BOTH", both_edge);
 
-   version = Py_BuildValue("s", "0.2.2");
+   version = Py_BuildValue("s", "0.2.3");
    PyModule_AddObject(module, "VERSION", version);
 }

source/event_gpio.c

@@ -66,7 +66,8 @@ struct callback
     int fde;
     int gpio;
     int edge;
-    void (*func)(int gpio);
+    void* data;
+    void (*func)(int gpio, void* data);
     struct callback *next;
 };
 struct callback *callbacks = NULL;
@@ -549,7 +550,7 @@ void exports_cleanup(void)
         gpio_unexport(exported_gpios->gpio);
 }
 
-int add_edge_callback(int gpio, int edge, void (*func)(int gpio))
+int add_edge_callback(int gpio, int edge, void (*func)(int gpio, void* data), void* data)
 {
     struct callback *cb = callbacks;
     struct callback *new_cb;
@@ -559,6 +560,7 @@ int add_edge_callback(int gpio, int edge, void (*func)(int gpio))
     new_cb->fde  = open_edge_file(gpio);
     new_cb->gpio = gpio;
     new_cb->edge = edge;
+    new_cb->data = data;
     new_cb->func = func;
     new_cb->next = NULL;
 
@@ -602,7 +604,7 @@ void run_callbacks(int gpio)
             // Only run if we are allowed
             if (canrun)
             {
-                cb->func(cb->gpio);
+                cb->func(cb->gpio, cb->data);
             }
 
         }

source/event_gpio.h

@@ -70,7 +70,7 @@ int gpio_set_edge(int gpio, unsigned int edge);
 int gpio_get_edge(int gpio);
 int add_edge_detect(int gpio, unsigned int edge);
 void remove_edge_detect(int gpio);
-int add_edge_callback(int gpio, int edge, void (*func)(int gpio));
+int add_edge_callback(int gpio, int edge, void (*func)(int gpio, void* data), void* data);
 int event_detected(int gpio);
 int gpio_event_add(int gpio);
 int gpio_event_remove(int gpio);

source/py_gpio.c

@@ -225,7 +225,7 @@ static PyObject *py_input_gpio(PyObject *self, PyObject *args)
     return py_value;
 }
 
-static void run_py_callbacks(int gpio)
+static void run_py_callbacks(int gpio, void* data)
 {
    PyObject *result;
    PyGILState_STATE gstate;
@@ -294,7 +294,7 @@ static int add_py_callback(char *channel, int gpio, int edge, unsigned int bounc
          cb = cb->next;
       cb->next = new_py_cb;
    }
-   add_edge_callback(gpio, edge, run_py_callbacks);
+   add_edge_callback(gpio, edge, run_py_callbacks, NULL);
    return 0;
 }
 
@@ -749,6 +749,54 @@ static PyObject *py_selftest(PyObject *self, PyObject *args)
 
 static const char moduledocstring[] = "GPIO functionality of a CHIP using Python";
 
+
+
+
+/*
+mine for changing pin directipn
+*/
+
+static PyObject *py_set_direction(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+	int gpio;
+	char *channel;
+	int direction;
+	static char *kwlist[] = { "channel", "direction", NULL };
+
+	clear_error_msg();
+
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si|ii", kwlist, &channel, &direction))
+		return NULL;
+
+	if (!module_setup) {
+		init_module();
+	}
+
+	if (direction != INPUT && direction != OUTPUT)
+	{
+		PyErr_SetString(PyExc_ValueError, "An invalid direction was passed to setup()");
+		return NULL;
+	}
+
+	if (get_gpio_number(channel, &gpio) < 0) {
+		char err[2000];
+		snprintf(err, sizeof(err), "Invalid channel %s. (%s)", channel, get_error_msg());
+		PyErr_SetString(PyExc_ValueError, err);
+		return NULL;
+	}
+
+	if (gpio_set_direction(gpio, direction) < 0) {
+		char err[2000];
+		snprintf(err, sizeof(err), "Error setting direction %d on channel %s. (%s)", direction, channel, get_error_msg());
+		PyErr_SetString(PyExc_RuntimeError, err);
+		return NULL;
+	}
+
+   remember_gpio_direction(gpio, direction);
+
+   Py_RETURN_NONE;
+}
+
 PyMethodDef gpio_methods[] = {
    {"setup", (PyCFunction)py_setup_channel, METH_VARARGS | METH_KEYWORDS, "Set up the GPIO channel, direction and (optional) pull/up down control\nchannel        - Either: CHIP board pin number (not R8 GPIO 00..nn number).  Pins start from 1\n                 or    : CHIP GPIO name\ndirection      - INPUT or OUTPUT\n[pull_up_down] - PUD_OFF (default), PUD_UP or PUD_DOWN\n[initial]      - Initial value for an output channel"},
    {"cleanup", py_cleanup, METH_VARARGS, "Clean up by resetting all GPIO channels that have been used by this program to INPUT with no pullup/pulldown and no event detection"},
@@ -763,9 +811,11 @@ PyMethodDef gpio_methods[] = {
    {"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"},
    {"selftest", py_selftest, METH_VARARGS, "Internal unit tests"},
+   { "direction", (PyCFunction)py_set_direction, METH_VARARGS, "Change direction of gpio channel. Either INPUT or OUTPUT\n" },
    {NULL, NULL, 0, NULL}
 };
 
+
 #if PY_MAJOR_VERSION > 2
 static struct PyModuleDef rpigpiomodule = {
    PyModuleDef_HEAD_INIT,
@@ -815,4 +865,4 @@ PyMODINIT_FUNC initGPIO(void)
 #else
    return;
 #endif
-}
+}