Model-Based Team / Mbed 2 deprecated CubicHand

Dependencies:   MMA8451Q TSI cc3000_hostdriver_mbedsocket NVIC_set_all_priorities mbed Multi_WS2811

Files at this revision

API Documentation at this revision

Comitter:
kalbers
Date:
Fri Dec 12 19:44:18 2014 +0000
Parent:
52:0f7a239cdd09
Parent:
54:d8ac7f7b1733
Child:
56:f95ec9baa4cb
Commit message:
Merged.

Changed in this revision

DataGlove.cpp Show annotated file Show diff for this revision Revisions of this file
DataGlove.h Show annotated file Show diff for this revision Revisions of this file
--- a/DataGlove.cpp	Thu Dec 11 21:22:42 2014 +0000
+++ b/DataGlove.cpp	Fri Dec 12 19:44:18 2014 +0000
@@ -195,7 +195,7 @@
     k += 4;
     for (y = 0; y < 5; y++) 
     {
-        gl.fingers[y] = 0.0;
+        gl.fingers[y] = 0;
     }
     q00 = q0 / 32768.0;
     q11 = q1 / 32768.0;
--- a/DataGlove.h	Thu Dec 11 21:22:42 2014 +0000
+++ b/DataGlove.h	Fri Dec 12 19:44:18 2014 +0000
@@ -34,7 +34,7 @@
         float roll, yaw, pitch;
         float norm, test;
         int q0, q1, q2, q3;
-        double q00, q11, q22, q33;
+        float q00, q11, q22, q33;
         long ReceiveCount;
         bool NewData;
         // Stores glove data