Diff: main.cpp

Revision:

9:c8d094afaa45

Parent:

8:4cf347c9d2b0

--- a/main.cpp	Thu Aug 27 14:27:16 2015 +0000
+++ b/main.cpp	Thu Aug 27 14:33:13 2015 +0000
@@ -55,8 +55,8 @@
 {
     advertisingStateLed = 1;
     
-    DEBUG("Disconnected handle %u, reason %u\n", handle, reason);
-    DEBUG("Restarting the advertising process\n\r");
+    DEBUG("Disconnected handle %u, reason %u\r\n", handle, reason);
+    DEBUG("Restarting the advertising process\r\n");
     ble.gap().startAdvertising();
 }
 
@@ -94,9 +94,9 @@
     Ticker ticker;
     ticker.attach(periodicCallback, 1);
        
-    DEBUG("Initialising the nRF51822\n");
+    DEBUG("Initialising the nRF51822\r\n");
     ble.init();
-    DEBUG("Init done\n");
+    DEBUG("Init done\r\n");
     ble.gap().onDisconnection(disconnectionCallback);
     ble.gap().onConnection(onConnectionCallback);
 
@@ -111,11 +111,11 @@
     ble.gap().setAdvertisingInterval(160); /* 100ms; in multiples of 0.625ms. */
     ble.gap().startAdvertising();
     advertisingStateLed = 1;
-    DEBUG("Start Advertising\n");
+    DEBUG("Start Advertising\r\n");
 
     ble.gattServer().addService(htmService);
     ble.gattServer().addService(battService);
-    DEBUG("Add Service\n");
+    DEBUG("Add Service\r\n");
 
     while (true) {
         if (triggerSensorPolling) {
@@ -139,7 +139,7 @@
       
       /* Update the temperature. Note that we need to convert to an ieee11073 format float. */
       float temperature = healthThemometer.read();
-      DEBUG("temp:%f\n", temperature);
+      DEBUG("temp:%f\r\n", temperature);
       uint32_t temp_ieee11073 = quick_ieee11073_from_float(temperature);
       memcpy(thermTempPayload+1, &temp_ieee11073, 4);
       ble.gattServer().write(tempChar.getValueAttribute().getHandle(), thermTempPayload, sizeof(thermTempPayload));  //Mod