Diff: main.cpp

Revision:

12:58823c0cdf99

Parent:

11:a60e398f9032

Child:

13:e5327d2de406

--- a/main.cpp	Sat Dec 09 03:13:24 2017 +0000
+++ b/main.cpp	Sat Dec 09 05:48:26 2017 +0000
@@ -1,5 +1,5 @@
+#include "mbed.h"
 #include "ADXL345_I2C.h"
-#include "mbed.h"
 #include "ble/BLE.h"
 #include "ble/services/UARTService.h"
 #include "Serial.h"
@@ -203,12 +203,12 @@
          ble.waitForEvent();
          wait(0.1);
          accelerometer.getOutput(readings);
-         uart1.printf("%i, %i, %i\n", (int16_t)readings[0], (int16_t)readings[1], (int16_t)readings[2]);
+         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("%i, %i, %i\n", (int16_t)avg1, (int16_t)avg2, (int16_t)avg3);
+         uart1.printf("\n%i, %i, %i\n", (int16_t)avg1, (int16_t)avg2, (int16_t)avg3);
 /*         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);*/
@@ -229,27 +229,27 @@
             //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)));
             totave[i] = (totvect[i] + totvect[i-1]) / 2 ;
-            uart1.printf("acc: %i\n", (int16_t)totave[i]);
+            uart1.printf("\t acc: %i\n", (int16_t)totave[i]);
             memset(&buffer, 0, sizeof(buffer));
-            snprintf(buffer, 20, "acc: %d\n", (int16_t)totave[i]);
+            snprintf(buffer, 20, "\t acc: %d\n", (int16_t)totave[i]);
             ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
 
             totvel[i]=(totave[i]*0.2);
-            uart1.printf("vel: %i\n", (int16_t)totvel[i]);
+            uart1.printf("\t vel: %i\n", (int16_t)totvel[i]);
             memset(&buffer, 0, sizeof(buffer));
-            snprintf(buffer, 20, "vel: %d\n", (int16_t)totvel[i]);
+            snprintf(buffer, 20, "\t vel: %d\n", (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("dist: %i\n", (int16_t)totdist[i]);
+            uart1.printf("\t dist: %i\n", (int16_t)totdist[i]);
             memset(&buffer, 0, sizeof(buffer));
-            snprintf(buffer, 20, "dist: %d\n", (int16_t)totdist[i]);
+            snprintf(buffer, 20, "\tdist: %d\n", (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("hght: %i\n\n", (int16_t)totheight[i]);
+            uart1.printf("\thght: %i\n", (int16_t)totheight[i]);
             memset(&buffer, 0, sizeof(buffer));
-            snprintf(buffer, 20, "hght: %d\n\n", (int16_t)totheight[i]);
+            snprintf(buffer, 20, "\thght: %d\n", (int16_t)totheight[i]);
             ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
   
             acc=acc+totave[i];
@@ -270,7 +270,7 @@
              {flag=0;}
              uart1.printf("steps: %i\n", (int16_t)steps);
              memset(&buffer, 0, sizeof(buffer));
-             snprintf(buffer, 20, "steps: %d\n", (int16_t)steps);
+             snprintf(buffer, 20, "\nsteps: %d\t", (int16_t)steps);
              ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
              
         }