Diff: main.cpp

Revision:

2:89f008ca5911

Parent:

1:cfb4bb8f33e9

Child:

3:3ee58f31a637

--- a/main.cpp	Thu Dec 07 06:31:23 2017 +0000
+++ b/main.cpp	Thu Dec 07 10:38:26 2017 +0000
@@ -14,13 +14,12 @@
 #define DEBUG(...) /* nothing */
 #endif /* #if NEED_CONSOLE_OUTPUT */
 
+ADXL345 accelerometer(p5, p6, p7, p8); // (SDA, SDO, SCL, CS);
 BLEDevice  ble;
 DigitalOut led1(LED1);
 Serial uart1(USBTX,USBRX);
 UARTService *uartServicePtr;
-ADXL345 accelerometer(p5, p6, p7, p8); // (SDA, SDO, SCL, CS);
 
-uint8_t sFlag = 0;
 
 void disconnectionCallback(const Gap::DisconnectionCallbackParams_t *params)
 {
@@ -57,10 +56,10 @@
 }
 
 
-int main() {
-
+int main() 
+{
+    uart1.baud(9600);
     int readings[3] = {0, 0, 0};
-    
     uart1.printf("Starting ADXL345 test...\n");
     uart1.printf("Device ID is: 0x%02x\n", accelerometer.getDevId());
 
@@ -76,6 +75,16 @@
     //Measurement mode.
     accelerometer.setPowerControl(0x08);
     
+    char buffer [20];
+       
+    // Test Daata
+    memset(&buffer, 0, sizeof(buffer));
+    int16_t reading_1 = 54;
+    int16_t reading_2 = 42;
+    int16_t reading_3 = 32;
+       
+    snprintf(buffer,20,"data: %d, %d, %d\n", reading_1, reading_2, reading_3);
+    
     led1 = 1;
     uart1.baud(9600);
     Ticker ticker;
@@ -108,9 +117,10 @@
         
         //13-bit, sign extended values.
         uart1.printf("%i, %i, %i\n", (int16_t)readings[0], (int16_t)readings[1], (int16_t)readings[2]);
-        ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)readings[0]/*params->data*/, sizeof(readings),false/*bytesRead*/);
-        ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)readings[1]/*params->data*/, sizeof(readings),false/*bytesRead*/);
-        ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)readings[2]/*params->data*/, sizeof(readings),false/*bytesRead*/);
+        
+        memset(&buffer, 0, sizeof(buffer));
+        snprintf(buffer, 20, "data: %d, %d, %d\n", (int16_t)readings[0],(int16_t)readings[1], (int16_t)readings[2]);
+        ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), (uint8_t*)buffer, sizeof(buffer), false);
 
     }