Changeset 119

Timestamp:

06/01/07 00:37:42 (2 years ago)

Author:

dsmith

Message:

added get_acc_cal to python

Files:

• branches/dev/python/Makefile.in (modified) (1 diff)
• branches/dev/python/Wiimote.c (modified) (4 diffs)

branches/dev/python/Makefile.in

@@ -21 +21 @@
-
-distclean: clean
+        rm Makefile
-
-.PHONY: all install uninstall clean distclean

branches/dev/python/Wiimote.c

@@ -22 +22 @@
- * 2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
- * * added Wiimote_FromC
+ * * added get_acc_cal
- *
- * 2007-05-27 Arthur Peters <amp@singingwizard.org>
@@ -68 +69 @@
-static PyObject *Wiimote_get_mesg(Wiimote *self);
-static PyObject *Wiimote_get_state(Wiimote *self, void *closure);
+static PyObject *Wiimote_get_acc_cal(Wiimote *self, PyObject *args,
+                                     PyObject *kwds);
-
-static PyObject *Wiimote_request_status(Wiimote *self);
@@ -95 +98 @@
-        {"get_mesg", (PyCFunction)Wiimote_get_mesg, METH_NOARGS,
-         "blocking call to get messages"},
+        {"get_acc_cal", (PyCFunction)Wiimote_get_acc_cal,
+         METH_VARARGS | METH_KEYWORDS, "get accelerometer calibration"},
-        {"request_status", (PyCFunction)Wiimote_request_status, METH_NOARGS,
-         "request status message"},
@@ -487 +492 @@
-}
-
+static PyObject *Wiimote_get_acc_cal(Wiimote *self, PyObject *args,
+                                     PyObject *kwds)
+{
+        static char *kwlist[] = { "ext_type", NULL };
+        int ext_type;
+        struct acc_cal acc_cal;
+        PyObject *PyAccCal;
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwds,
+                                         "i:cwiid.Wiimote.get_acc_cal", kwlist,
+                                         &ext_type)) {
+                return NULL;
+        }
+
+        if (cwiid_get_acc_cal(self->wiimote, ext_type, &acc_cal)) {
+                PyErr_SetString(PyExc_IOError, "Wiimote get acc cal error");
+                return NULL;
+        }
+
+        if (!(PyAccCal = Py_BuildValue("([i,i,i],[i,i,i])", acc_cal.zero[0],
+                                       acc_cal.zero[1], acc_cal.zero[2],
+                                       acc_cal.one[0], acc_cal.one[1],
+                                       acc_cal.one[2]))) {
+                return NULL;
+        }
+
+        return PyAccCal;
+}
+
-static PyObject *Wiimote_request_status(Wiimote *self)
-{