Diff: WiiChuk_compat.cpp

Revision:

2:566662f892b1

Parent:

1:7ff30607465f

Child:

4:bf058247fb2f

--- a/WiiChuk_compat.cpp	Mon Jun 08 15:31:50 2015 +0000
+++ b/WiiChuk_compat.cpp	Mon Jun 08 19:53:32 2015 +0000
@@ -3,7 +3,7 @@
 
 
 WiiChuck::WiiChuck(PinName data, PinName clk, Stream &_pc):_i2c(data, clk), pc(_pc) {
-    _i2c.frequency(400000); // should work at 100000 too
+    _i2c.frequency(50000); // should work at 100000 too
     Error = true;
 
     // initialize Wii extension (nunchuk) based on "new way" initialization
@@ -16,13 +16,13 @@
     }
     
     cmd[0] = 0xfb; cmd[1]= 0x00;
-    pc.printf("WiiChuck init nack %i\r\n", _i2c.write(NUNCHUCK_ADDR, (const char*)cmd, sizeof(cmd), true));
+    pc.printf("%i\r\n", _i2c.write(NUNCHUCK_ADDR, (const char*)cmd, sizeof(cmd), true));
   
     _oldC = 0;
     _oldZ = 0;
 }
 
-bool WiiChuck::Read(int* joyX,int* joyY,int* accX,int* accY,int* accZ,int* buttonC,int* buttonZ) {
+bool WiiChuck::Read(uint8_t* joyX, uint8_t* joyY, uint16_t* accX, uint16_t* accY, uint16_t* accZ, uint8_t* buttonC, uint8_t* buttonZ) {
 
     //int i;
     char readBuf[NUNCHUCK_READLEN];
@@ -36,8 +36,9 @@
         wait(I2C_READ_DELAY);
         if (_i2c.read(NUNCHUCK_ADDR, readBuf, sizeof(readBuf)) == I2C_ACK) {
             //init values
+            //n->X = 0; n->Y = 0; n->aX = 0; n->aY = 0; n->aZ = 0; n->C = 0; n->Z = 0;
             *joyX = 0; *joyY = 0; *accX = 0; *accY = 0; *accZ = 0; *buttonC = 0; *buttonZ = 0;
-   
+   /*
             pc.printf("\r\n");
             //  Decrypting not required with new initialization
             for (int i = 0; i < NUNCHUCK_READLEN; ++i) {
@@ -45,7 +46,7 @@
                 pc.printf("%i ", readBuf[i]);
             }
             pc.printf("\r\n");
-            
+     */       
             
             *joyX = readBuf[Joy_X];
             *joyY = readBuf[Joy_Y];
@@ -94,9 +95,9 @@
 
 void WiiChuck::getValues()
 {
-    int joyX = 0;int joyY = 0;
-    int accX = 0;int accY = 0;int accZ = 0;
-    int buttonC = 0;int buttonZ = 0;
+    uint8_t joyX = 0, joyY = 0;
+    uint16_t accX = 0, accY = 0, accZ = 0;
+    uint8_t buttonC = 0, buttonZ = 0;
      
     bool read = Read(&joyX,&joyY,&accX,&accY,&accZ,&buttonC,&buttonZ);