Ticket #5: cwiid-wminput-plugin-enhancements.diff

wminput/plugins/ir_ptr/ir_ptr.c

@@ -32 +32 @@
         uint16_t x;
         uint16_t y;
 };
+int a_debounce, b_debounce;
 
 /* static objects are initialized to 0 by default */
 static int a_index = -1, b_index = -1;
@@ -134 +135 @@
                         }
                 }
         }
+
+#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;
         }
 
         /* if both sources are valid, calculate the center */
@@ -216 +234 @@
         old_flags = flags;
 
         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/acc/acc.c

@@ -127 +127 @@
         return ret;
 }
 
+#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));
         roll = atan(a_x/a_z);
@@ -147 +151 @@
 
         pitch = atan(a_y/a_z*cos(roll));
 
-        data.axes[0].value = roll*1000;
-        data.axes[1].value = pitch*1000;
+        //printf( "roll %.2f       pitch %.2f\n", roll, pitch );
 
+        data.axes[0].value = roll*2000;
+        data.axes[1].value = pitch*2000;
+
         if ((a > 0.85) && (a < 1.15)) {
                 if ((fabs(roll)*(180/PI) > 10) && (fabs(pitch)*(180/PI) < 80)) {
                         data.axes[2].valid = 1;