Revision 1:27afe2b7a5c0, committed 2016-04-29

Comitter:

lompartpatryk

Date:

Fri Apr 29 12:19:15 2016 +0000

Parent:

0:489c902dd8df

Commit message:

21

Changed in this revision

diff -r 489c902dd8df -r 27afe2b7a5c0 main.cpp
--- a/main.cpp	Thu Apr 28 20:43:52 2016 +0000
+++ b/main.cpp	Fri Apr 29 12:19:15 2016 +0000
@@ -1,18 +1,40 @@
 #include "mbed.h"
-#include "USBMouse.h"
+#include "USBMouseKeyboard.h"
 #include "MMA8451Q.h"
 
 #define MMA8451_I2C_ADDRESS (0x1d<<1)
+#define PRESS_ON 0
+#define PRESS_OFF 1
 
-MMA8451Q acc(PTE25, PTE24, MMA8451_I2C_ADDRESS);
-USBMouse mouse;
+MMA8451Q acc(PTE25, PTE24);
+USBMouseKeyboard mouse;
+
+
+DigitalIn sw1(PTC3);
+DigitalIn sw3(PTC12);
+int sw1State;
+int sw3State;
 
 int main (void)
 {
+    sw1.mode(PullUp);
+    sw3.mode(PullUp);
+    
+    
     while (1)
     {
-        float accValX = acc.getAccX(); //accX[-1..1]
-        mouse.move(accValX*16,0);
+        sw1State=sw1;
+        sw3State=sw3;
+        
+        int16_t* axis=(int16_t*)malloc(3*sizeof(int16_t));
+        acc.getAccAllAxis(axis);
+        mouse.move(axis[0]/1024,axis[1]/1024);
+        
+        if(sw1State==PRESS_ON)mouse.mediaControl(KEY_VOLUME_DOWN);
+        //else mouse.release(MOUSE_LEFT);
+        
+        if(sw3State==PRESS_ON)mouse.mediaControl(KEY_VOLUME_UP);
+       
         wait(0.05); //wait 50ms
     }
 }
\ No newline at end of file