Changeset 1b85b3453508760034543f581cd81bf742bc4edc

Timestamp:

04/09/07 00:27:22 (6 years ago)

Author:

dsmith <dsmith@…>

Children:

e39b37ab41f0238d01273bb43a18bb92e0052bad

Parents:

2547e8f25e763b200d31004cde5b97f428d0afc9

git-author:

L. Donnie Smith <donnie.smith@…> (04/09/07 00:27:22)

git-committer:

dsmith <dsmith@…> (04/09/07 00:27:22)

Message:

plugin improvements (ir src debounce, low-pass filters) (#5)

git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@73 918edb2d-ff29-0410-9de2-eb38e7f22bc7

Files:

• ChangeLog (modified) (2 diffs)
• wminput/plugins/acc/acc.c (modified) (2 diffs)
• wminput/plugins/ir_ptr/ir_ptr.c (modified) (4 diffs)
• wminput/plugins/nunchuk_acc/nunchuk_acc.c (modified) (1 diff)

ChangeLog

@@ +1 @@
+2007-04-08 Arthur Peters <amp@singingwizard.org>
+        wminput
+        * added debounce and low-pass filter to ir_ptr plugin
+        * added low-pass filter to acc plugin
+
 2007-04-08 L. Donnie Smith <cwiid@abstrakraft.org>
         defs.mak
@@ -11 +16 @@
         wminput
         * fixed signed/unsigned comparison warning in uinput_open and get_plugin
+        * copied acc low-pass filter to nunchuk_acc
 
 2007-04-08 Petter Reinholdtsen <pere@hungry.com>

wminput/plugins/acc/acc.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-04-08 Arthur Peters <amp@singingwizard.org>
+ *  * added low-pass filter
+ *
  *  2007-03-04 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * type audit (stdint, const, char booleans)
@@ -128 +131 @@
 }
 
+#define NEW_AMOUNT 0.1
+#define OLD_AMOUNT (1.0-NEW_AMOUNT)
+double a_x = 0, a_y = 0, a_z = 0;
+
 static void process_acc(struct wiimote_acc_mesg *mesg)
 {
-        double a_x, a_y, a_z, a;
+        double a;
         double roll, pitch;
 
-        a_x = ((double)mesg->x - acc_zero.x) /
-              (acc_one.x - acc_zero.x);
-        a_y = ((double)mesg->y - acc_zero.y) /
-              (acc_one.y - acc_zero.y);
-        a_z = ((double)mesg->z - acc_zero.z) /
-              (acc_one.z - acc_zero.z);
+        a_x = (((double)mesg->x - acc_zero.x) /
+              (acc_one.x - acc_zero.x))*NEW_AMOUNT + a_x*OLD_AMOUNT;
+        a_y = (((double)mesg->y - acc_zero.y) /
+              (acc_one.y - acc_zero.y))*NEW_AMOUNT + a_y*OLD_AMOUNT;
+        a_z = (((double)mesg->z - acc_zero.z) /
+              (acc_one.z - acc_zero.z))*NEW_AMOUNT + a_z*OLD_AMOUNT;
 
         a = sqrt(pow(a_x,2)+pow(a_y,2)+pow(a_z,2));

wminput/plugins/ir_ptr/ir_ptr.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2007-04-08 Arthur Peters <amp@singingwizard.org>
+ *  * added debounce and low pass filter
+ *
  *  2007-03-04 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * type audit (stdint, const, char booleans)
@@ -33 +36 @@
         uint16_t y;
 };
+int a_debounce, b_debounce;
 
 /* static objects are initialized to 0 by default */
@@ -135 +139 @@
                 }
         }
+
+#define DEBOUNCE_THRESHOLD 50
+
         /* set a & b, mirror the x coordinates */
         if (a_index == -1) {
-                a.valid = 0;
+                a_debounce++;
+                if( a_debounce > DEBOUNCE_THRESHOLD ) {
+                        a.valid = 0;
+                }
+                else {
+                        a = prev_a;
+                }
         }
         else {
                 a = ir_mesg->src[a_index];
                 a.x = WIIMOTE_IR_X_MAX - a.x;
+                a_debounce = 0;
         }
         if (b_index == -1) {
-                b.valid = 0;
+                b_debounce++;
+                if( b_debounce > DEBOUNCE_THRESHOLD ) {
+                        b.valid = 0;
+                }
+                else {
+                        b = prev_b;
+                }
         }
         else {
                 b = ir_mesg->src[b_index];
                 b.x = WIIMOTE_IR_X_MAX - b.x;
+                b_debounce = 0;
         }
 
@@ -217 +238 @@
 
         data.axes[0].valid = data.axes[1].valid = c.valid;
-        data.axes[0].value = c.x;
-        data.axes[1].value = c.y;
+
+#define NEW_AMOUNT 0.6
+#define OLD_AMOUNT (1.0-NEW_AMOUNT)
+
+        data.axes[0].value = c.x*NEW_AMOUNT + data.axes[0].value*OLD_AMOUNT;
+        data.axes[1].value = c.y*NEW_AMOUNT + data.axes[1].value*OLD_AMOUNT;
 
         return &data;

wminput/plugins/nunchuk_acc/nunchuk_acc.c

@@ -136 +136 @@
 }
 
+#define NEW_AMOUNT 0.1
+#define OLD_AMOUNT (1.0-NEW_AMOUNT)
+double a_x = 0, a_y = 0, a_z = 0;
+
 static void process_nunchuk(struct wiimote_nunchuk_mesg *mesg)
 {
-        double a_x, a_y, a_z, a;
+        double a;
         double roll, pitch;
 
-        a_x = ((double)mesg->acc_x - acc_zero.x) /
-              (acc_one.x - acc_zero.x);
-        a_y = ((double)mesg->acc_y - acc_zero.y) /
-              (acc_one.y - acc_zero.y);
-        a_z = ((double)mesg->acc_z - acc_zero.z) /
-              (acc_one.z - acc_zero.z);
+        a_x = (((double)mesg->acc_x - acc_zero.x) /
+              (acc_one.x - acc_zero.x))*NEW_AMOUNT + a_x*OLD_AMOUNT;
+        a_y = (((double)mesg->acc_y - acc_zero.y) /
+              (acc_one.y - acc_zero.y))*NEW_AMOUNT + a_y*OLD_AMOUNT;
+        a_z = (((double)mesg->acc_z - acc_zero.z) /
+              (acc_one.z - acc_zero.z))*NEW_AMOUNT + a_z*OLD_AMOUNT;
 
         a = sqrt(pow(a_x,2)+pow(a_y,2)+pow(a_z,2));