Diff: main.cpp

Revision:

16:e97016b6a7e0

Parent:

15:a24cfc193284

Child:

17:75e827cd0923

--- a/main.cpp	Tue Dec 12 16:12:22 2017 +0000
+++ b/main.cpp	Mon Feb 19 08:53:20 2018 +0000
@@ -49,7 +49,7 @@
     led1 = !led1;
 }
 
-int threshold =80;
+int threshold =6.8;
 int xval[10]={0};
 int yval[10]={0};
 int zval[10]={0};
@@ -58,7 +58,7 @@
 int zavg;
 
 
-int calibratex()
+/*int calibratex()
 {
    int readings[3] = {0, 0, 0};
    led1=1;
@@ -66,7 +66,7 @@
    for (int i=0; i<10; i++)
    {
        accelerometer.getOutput(readings);
-       xval[i]=(readings[0]);  //nilai x adxl345
+       xval[i]=(readings[0] - 345);  //nilai x adxl345
        sum1 = xval[i]+sum1;
    }
    
@@ -83,7 +83,7 @@
    for (int i=0; i<10; i++)
    {
        accelerometer.getOutput(readings);
-        yval[i]=(readings[1]); //nilai y adxl345
+        yval[i]=(readings[1] - 346); //nilai y adxl345
        sum2 = yval[i]+sum2;
    }
    yavg=sum2/10.0;
@@ -99,14 +99,14 @@
    for (int i=0; i<10; i++)
    {
        accelerometer.getOutput(readings);
-        zval[i]=(readings[2]); //nilai z adxl345
+        zval[i]=(readings[2] - 416); //nilai z adxl345
        sum3 = zval[i]+sum3;
    }
    
    zavg=sum3/10.0;
    led1=0;     
    return zavg;
-}
+}*/
 
 
 
@@ -134,20 +134,20 @@
        
        // Test Daata
        memset(&buffer, 0, sizeof(buffer));
-/*       int16_t reading_1= 0;
+       int16_t reading_1= 0;
        int16_t reading_2= 0;
        int16_t reading_3= 0;
        int16_t avg_1= 0;
        int16_t avg_2= 0;
-       int16_t avg_3= 0;*/
+       int16_t avg_3= 0;
        
-       int16_t lang     = 0;
+/*       int16_t lang     = 0;
        int16_t perc     = 0;
        int16_t kec      = 0;
        int16_t jar      = 0;
        int16_t ting     = 0;
-       snprintf(buffer, 20, "data: %d,%d,%d,%d,%d\n",(int16_t)lang,(int16_t)perc,(int16_t)kec,(int16_t)jar,(int16_t)ting);
-/*       snprintf(buffer, 20, "data: %d,%d,%d,%d,%d,%d\n",(int16_t)reading_1,(int16_t)reading_2,(int16_t)reading_3,(int16_t)avg_1,(int16_t)avg_2,(int16_t)avg_3);*/
+       snprintf(buffer, 20, "data: %d,%d,%d,%d,%d\n",(int16_t)lang,(int16_t)perc,(int16_t)kec,(int16_t)jar,(int16_t)ting);*/
+       snprintf(buffer, 20, "data: %d,%d,%d,%d,%d,%d\n",(int16_t)reading_1,(int16_t)reading_2,(int16_t)reading_3,(int16_t)avg_1,(int16_t)avg_2,(int16_t)avg_3);
 
        
     led1 = 1;
@@ -203,55 +203,33 @@
          ble.waitForEvent();
          wait(0.1);
          accelerometer.getOutput(readings);
-         uart1.printf("\n%i, %i, %i\n", (int16_t)readings[0], (int16_t)readings[1], (int16_t)readings[2]);
-/*         memset(&buffer, 0, sizeof(buffer));
+/*         uart1.printf("\n%i, %i, %i\n", (int16_t)readings[0], (int16_t)readings[1], (int16_t)readings[2]);
+         memset(&buffer, 0, sizeof(buffer));
          snprintf(buffer, 20, "data: %d,%d,%d\n\n", (int16_t)readings[0],(int16_t)readings[1],(int16_t)readings[0]);
          ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);*/
          
          uart1.printf("\n%i, %i, %i\n", (int16_t)avg1, (int16_t)avg2, (int16_t)avg3);
-/*         memset(&buffer, 0, sizeof(buffer));
+         memset(&buffer, 0, sizeof(buffer));
          snprintf(buffer, 20, "data: %d,%d,%d\n\n", (int16_t)avg1,(int16_t)avg2,(int16_t)avg3);
          ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
-         wait(0.1);*/
+         wait(0.1);
          
          
          
          //float x,y,z
         for (int i=0; i<10; i++)
         {
-            xaccl[i]=(readings[0]);
+            xaccl[i]=(readings[0] - 345);
             wait(0.1);
-            yaccl[i]=(readings[1]);
+            yaccl[i]=(readings[1] - 346);
             wait(0.1);
-            zaccl[i]=(readings[2]);
+            zaccl[i]=(readings[2] - 416);
             wait(0.1);
             
             //formula
-            totvect[i] = sqrt((double)((xaccl[i]-xavg)* (xaccl[i]-xavg))+(double) ((yaccl[i] - yavg)*(yaccl[i] - yavg)) +(double) ((zaccl[i] - zavg)*(zaccl[i] - zavg)));
+            //totvect[i] = sqrt((double)((xaccl[i]-xavg)* (xaccl[i]-xavg))+(double) ((yaccl[i] - yavg)*(yaccl[i] - yavg)) +(double) ((zaccl[i] - zavg)*(zaccl[i] - zavg)));
+            totvect[i] = sqrt((double)(xaccl[i]*xaccl[i])+(double)(yaccl[i]*yaccl[i])+(double)(zaccl[i]*zaccl[i]));
             totave[i] = (totvect[i] + totvect[i-1]) / 2 ;
-            uart1.printf("\tacc:%i", (int16_t)totave[i]);
-            memset(&buffer, 0, sizeof(buffer));
-            snprintf(buffer, 20, "\tacc:%d", (int16_t)totave[i]);
-            ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
-
-            totvel[i]=(totave[i]*0.2);
-            uart1.printf("\tvel:%i", (int16_t)totvel[i]);
-            memset(&buffer, 0, sizeof(buffer));
-            snprintf(buffer, 20, "\tvel:%d", (int16_t)totvel[i]);
-            ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
-
-            totdist[i]=(totvect[i]*(0.2*0.2)/2);
-            uart1.printf("\tdist:%i", (int16_t)totdist[i]);
-            memset(&buffer, 0, sizeof(buffer));
-            snprintf(buffer, 20, "\tdist:%d", (int16_t)totdist[i]);
-            ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
-  
-            totheight[i]=sqrt((((xaccl[i]-xavg)* (xaccl[i]-xavg))+ ((yaccl[i] - yavg)*(yaccl[i] - yavg)))*(0.2*0.2)/2);
-            uart1.printf("\thght:%i", (int16_t)totheight[i]);
-            memset(&buffer, 0, sizeof(buffer));
-            snprintf(buffer, 20, "\thght:%d", (int16_t)totheight[i]);
-            ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
-  
             acc=acc+totave[i];
          
          
@@ -273,7 +251,33 @@
              snprintf(buffer, 20, "\nsteps:%d", (int16_t)steps);
              ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
              
+            uart1.printf("\tacc:%i", (int16_t)totave[i]);
+            memset(&buffer, 0, sizeof(buffer));
+            snprintf(buffer, 20, "\tacc:%d", (int16_t)totave[i]);
+            ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
+        
+        
+/*            totvel[i]=(totave[i]*0.2);
+            uart1.printf("\tvel:%i", (int16_t)totvel[i]);
+            memset(&buffer, 0, sizeof(buffer));
+            snprintf(buffer, 20, "\tvel:%d", (int16_t)totvel[i]);
+            ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
+
+            totdist[i]=(totvect[i]*(0.2*0.2)/2);
+            uart1.printf("\tdist:%i", (int16_t)totdist[i]);
+            memset(&buffer, 0, sizeof(buffer));
+            snprintf(buffer, 20, "\tdist:%d", (int16_t)totdist[i]);
+            ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
+  
+            totheight[i]=sqrt((double)(xaccl[i]*xaccl[i])+(double)(yaccl[i]*yaccl[i])) * ((0.2*0.2)/2);
+            uart1.printf("\thght:%i", (int16_t)totheight[i]);
+            memset(&buffer, 0, sizeof(buffer));
+            snprintf(buffer, 20, "\thght:%d", (int16_t)totheight[i]);
+            ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);*/
+      
         }
+        
+        
     }
  
  }