Changeset 130

Timestamp:

06/28/07 18:25:39 (2 years ago)

Author:

dsmith

Message:

ir_ptr rewrite

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/wminput/plugins/ir_ptr/ir_ptr.c (modified) (7 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-06-27 L. Donnie Smith <cwiid@abstrakraft.org>
+        wminput
+        * rewrote ir_ptr plugin
+
+        libcwiid
+        * changed version
+
-2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>
-        wminput

trunk/wminput/plugins/ir_ptr/ir_ptr.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-06-28 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * Converted to single source
+ *  * Added deadspace at edges
+ *
- *  2007-06-01 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * updated for wmplugin_exec prototype change (&mesg->mesg)
@@ -45 +49 @@
-#include "wmplugin.h"
-
+#define DEBOUNCE_THRESHOLD      50
+#define NEW_AMOUNT      0.3
+#define OLD_AMOUNT      (1.0 - NEW_AMOUNT)
+#define X_EDGE  50
+#define Y_EDGE  50
+
-cwiid_wiimote_t *wiimote;
-
-struct cursor {
-        unsigned char valid;
-        uint16_t pos[2];
-};
-int a_debounce, b_debounce;
-
-/* static objects are initialized to 0 by default */
-static int a_index = -1, b_index = -1;
-static struct cwiid_ir_src a, b, prev_a, prev_b;
-
-static unsigned char info_init = 0;
-static struct wmplugin_info info;
-static struct wmplugin_data data;
-
-static struct cursor c, prev_c;
-
-wmplugin_info_t wmplugin_info;
@@ -68 +65 @@
-
-struct wmplugin_info *wmplugin_info() {
+        static unsigned char info_init = 0;
+
-        if (!info_init) {
-                info.button_count = 0;
@@ -73 +72 @@
-                info.axis_info[0].name = "X";
-                info.axis_info[0].type = WMPLUGIN_ABS;
-1024
-0
+CWIID_IR_X_MAX - X_EDGE
+X_EDGE
-                info.axis_info[0].fuzz = 0;
-                info.axis_info[0].flat = 0;
-                info.axis_info[1].name = "Y";
-                info.axis_info[1].type = WMPLUGIN_ABS;
-768
-0
+CWIID_IR_Y_MAX - Y_EDGE
+Y_EDGE
-                info.axis_info[1].fuzz = 0;
-                info.axis_info[1].flat = 0;
@@ -104 +103 @@
-struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[])
-{
+        static int src_index = -1;
+        static int debounce = 0;
+        static uint8_t old_flag;
+
-        int i;
-
-
+
-        struct cwiid_ir_mesg *ir_mesg;
-
@@ -120 +122 @@
-        }
-
-update history
-prev_a = a;
-prev_b = b;
-prev_c = c
-
-/* invalidate a & b indices if sources are no longer present */
-if ((a_index != -1) && (!ir_mesg->src[a_index].valid)) {
-a_index = -1;
+invalidate src index if source is no longer present
+if ((src_index != -1) && !ir_mesg->src[src_index].valid) {
+       if (debounce > DEBOUNCE_THRESHOLD) {
+               src_index = -1
+
+       else {
+               debounce++;
+}
-        }
-if ((b_index != -1) && (!ir_mesg->src[b_index].valid))
-b_index = -1
+else
+debounce = 0
-        }
-
-for a & b 
-a
+
+src
-                for (i=0; i < CWIID_IR_SRC_COUNT; i++) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                                }
-                        }
@@ -156 +147 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
+
+
+
+
+
+
+
+
-                }
-        }
-        else {
-                a = ir_mesg->src[a_index];
-                a.pos[CWIID_X] = CWIID_IR_X_MAX - a.pos[CWIID_X];
-                a_debounce = 0;
-        }
-        if (b_index == -1) {
-                b_debounce++;
-                if( b_debounce > DEBOUNCE_THRESHOLD ) {
-                        b.valid = 0;
-                }
-                else {
-                        b = prev_b;
-                }
-        }
-        else {
-                b = ir_mesg->src[b_index];
-                b.pos[CWIID_X] = CWIID_IR_X_MAX - b.pos[CWIID_X];
-                b_debounce = 0;
-        }
-
-        /* if both sources are valid, calculate the center */
-        if (a.valid && b.valid) {
-                c.valid = 1;
-                for (i=0; i < 2; i++) {
-                        c.pos[i] = (a.pos[i] + b.pos[i])/2;
-                }
-        }
-        /* if either source is valid, use best guess */
-        else if (a.valid) {
-                /* if a isn't new, and we have a previous center,
-                 * assume source-center relationship holds */
-                if (prev_a.valid && prev_c.valid) {
-                        c.valid = 1;
-                        for (i=0; i < 2; i++) {
-                                c.pos[i] = a.pos[i] + (prev_c.pos[i] - prev_a.pos[i]);
-                        }
-                }
-                /* if a is new or we don't have a previous center,
-                 * use a as the center */
-                else {
-                        c.valid = 1;
-                        for (i=0; i < 2; i++) {
-                                c.pos[i] = a.pos[i];
-                        }
-                }
-        }
-        else if (b.valid) {
-                /* if b isn't new, and we have a previous center,
-                 * assume source-center relationship holds */
-                if (prev_b.valid && prev_c.valid) {
-                        c.valid = 1;
-                        for (i=0; i < 2; i++) {
-                                c.pos[i] = b.pos[i] + (prev_c.pos[i] - prev_b.pos[i]);
-                        }
-                }
-                /* if b is new or we don't have a previous center,
-                 * use b as the center */
-                else {
-                        c.valid = 1;
-                        for (i=0; i < 2; i++) {
-                                c.pos[i] = b.pos[i];
-                        }
-                }
-        }
-        /* no sources, no guesses */
-        else {
-                c.valid = 0;
-        }
-
-        /* LEDs */
-        flags = 0;
-        if ((a_index == 1) || (b_index == 1)) {
-                flags |= CWIID_LED1_ON;
-        }
-        else if ((a_index == 2) || (b_index == 2)) {
-                flags |= CWIID_LED2_ON;
-        }
-        else if ((a_index == 3) || (b_index == 3)) {
-                flags |= CWIID_LED3_ON;
-        }
-        else if ((a_index == 4) || (b_index == 4)) {
-                flags |= CWIID_LED4_ON;
-        }
-        if (flags != old_flags) {
-                cwiid_set_led(wiimote, flags);
-        }
-        old_flags = flags;
-
-        data.axes[0].valid = data.axes[1].valid = c.valid;
-
-#define NEW_AMOUNT 0.6
-#define OLD_AMOUNT (1.0-NEW_AMOUNT)
-
-        data.axes[0].value = c.pos[CWIID_X]*NEW_AMOUNT +
-                             data.axes[0].value*OLD_AMOUNT;
-        data.axes[1].value = c.pos[CWIID_Y]*NEW_AMOUNT +
-                             data.axes[1].value*OLD_AMOUNT;
-
-        return &data;