Changeset 109

Timestamp:

05/09/07 20:04:35 (2 years ago)

Author:

dsmith

Message:

cwiidpy: get_state

Files:

• branches/cwiidpy/cwiidmodule.c (modified) (4 diffs)

branches/cwiidpy/cwiidmodule.c

@@ -20 +20 @@
- *
- * ChangeLog:
+ * 2007-05-07 L. Donnie Smith <cwiid@abstrakraft.org>
+ * * finished get_state
- * 2007-05-07 L. Donnie Smith <cwiid@abstrakraft.org>
- * * C-style comments
@@ -494 +496 @@
-        }
-
-h
+i,s:i
-                                "rpt_mode", state.rpt_mode,
-                                "led", state.led,
-                                "rumble", state.rumble,
-                                "battery", state.battery,
-
-
-
+
+
+
+
-                PyObject *PyBtn = Py_BuildValue("i", state.buttons);
-                if (!PyBtn) {
@@ -515 +518 @@
-        }
-
-|
-i,s:i,s:i
+&
+b,s:b,s:b
-                                                                    "x", state.acc[CWIID_X],
-                                            "y", state.acc[CWIID_Y],
@@ -530 +533 @@
-                }
-                Py_DECREF(PyAcc);
+        }
+
+        if (state.rpt_mode & CWIID_RPT_IR) {
+                int i;
+                PyObject *PyIr = PyList_New(CWIID_IR_SRC_COUNT);
+
+                if (!PyIr) {
+                        Py_DECREF(PyState);
+                        return NULL;
+                }
+
+                if (PyDict_SetItemString(PyState, "ir_src", PyIr)) {
+                        Py_DECREF(PyState);
+                        Py_DECREF(PyIr);
+                        return NULL;
+                }
+
+                Py_DECREF(PyIr);
+
+                for (i=0; i < CWIID_IR_SRC_COUNT; i++) {
+                        PyObject *PyIrSrc;
+
+                        if (state.ir_src[i].valid) {
+                                PyIrSrc = Py_BuildValue("{s:{s:i,s:i},s:b}",
+                                                        "pos",
+                                                          "x", state.ir_src[i].pos[CWIID_X],
+                                                          "y", state.ir_src[i].pos[CWIID_Y],
+                                                        "size", state.ir_src[i].size);
+                                if (!PyIrSrc) {
+                                        Py_DECREF(PyState);
+                                        return NULL;
+                                }
+                        }
+                        else {
+                                Py_INCREF(PyIrSrc = Py_None);
+                        }
+
+                        PyList_SET_ITEM(PyIr, i, PyIrSrc);
+                }
+        }
+
+        switch (state.ext_type) {
+                PyObject *PyExt;
+        case CWIID_EXT_NUNCHUK:
+                if (state.rpt_mode & CWIID_RPT_NUNCHUK) {
+                        PyExt = Py_BuildValue("{s:{s:b,s:b},s:{s:b,s:b,s:b},s:i}",
+                                              "stick",
+                                                "x", state.ext.nunchuk.stick[CWIID_X],
+                                                "y", state.ext.nunchuk.stick[CWIID_Y],
+                                              "acc",
+                                                "x", state.ext.nunchuk.acc[CWIID_X],
+                                                "y", state.ext.nunchuk.acc[CWIID_Y],
+                                                "z", state.ext.nunchuk.acc[CWIID_Z],
+                                              "buttons", state.ext.nunchuk.buttons);
+
+                        if (!PyExt) {
+                                Py_DECREF(PyState);
+                                return NULL;
+                        }
+
+                        if (PyDict_SetItemString(PyState, "nunchuk", PyExt)) {
+                                Py_DECREF(PyState);
+                                Py_DECREF(PyExt);
+                                return NULL;
+                        }
+
+                        Py_DECREF(PyExt);
+                }
+                break;
+        case CWIID_EXT_CLASSIC:
+                if (state.rpt_mode & CWIID_RPT_CLASSIC) {
+                        PyExt = Py_BuildValue("{s:{s:b,s:b},s:{s:b,s:b},s:b,s:b,s:i}",
+                                              "l_stick",
+                                                "x", state.ext.classic.l_stick[CWIID_X],
+                                                "y", state.ext.classic.l_stick[CWIID_Y],
+                                              "r_stick",
+                                                "x", state.ext.classic.r_stick[CWIID_X],
+                                                "y", state.ext.classic.r_stick[CWIID_Y],
+                                              "l", state.ext.classic.l,
+                                              "r", state.ext.classic.r,
+                                              "buttons", state.ext.classic.buttons);
+
+                        if (!PyExt) {
+                                Py_DECREF(PyState);
+                                return NULL;
+                        }
+
+                        if (PyDict_SetItemString(PyState, "classic", PyExt)) {
+                                Py_DECREF(PyState);
+                                Py_DECREF(PyExt);
+                                return NULL;
+                        }
+
+                        Py_DECREF(PyExt);
+                }
+                break;
+        default:
+                break;
-        }
-