Revision 9:46ce96e9954f, committed 2015-07-21

Comitter:

jamescmaki

Date:

Tue Jul 21 16:10:00 2015 +0000

Parent:

8:5b33eee8e2a5

Commit message:

Fix line endings to \r\n

Changed in this revision

diff -r 5b33eee8e2a5 -r 46ce96e9954f main.cpp
--- a/main.cpp	Tue Jul 21 14:57:52 2015 +0000
+++ b/main.cpp	Tue Jul 21 16:10:00 2015 +0000
@@ -235,8 +235,8 @@
     mDot15.mode(PullUp);
     mDot16.mode(PullUp);
 
-    printf("font table address %p\n\r", &font_6x8);
-    printf("bitmap address %p\n\r", &MultiTech_Logo);
+    printf("font table address %p\r\n", &font_6x8);
+    printf("bitmap address %p\r\n", &MultiTech_Logo);
 
     // Setup and display logo on LCD
     evbLCD->startUpdate();
@@ -252,7 +252,7 @@
 
     evbLCD->endUpdate();
 
-    printf("\n\r setup mdot\n\r");
+    printf("\r\n setup mdot\r\n");
 
     // get a mDot handle
     mdot_radio = mDot::getInstance();
@@ -271,7 +271,7 @@
         for (i = 0; i < mdot_EUI.size(); i++) {
             printf("%02x ", mdot_EUI[i]);
         }
-        printf("\n\r");
+        printf("\r\n");
 
         printf("setting Network Mode to %s\r\n", public_net ? "public" : "private");
         if ((mdot_ret = mdot_radio->setPublicNetwork(public_net)) != mDot::MDOT_OK) {
@@ -319,7 +319,7 @@
             } else {
                 mdot_ret = 0;
             }
-            printf("delay = %lu\n\r", mdot_ret);
+            printf("delay = %lu\r\n", mdot_ret);
             osDelay(mdot_ret + 1);
         }
 
@@ -327,14 +327,14 @@
          * Check for PB1 press during network join attempt
          */
         if (exit_program) {
-            printf("Exiting program\n\r");
+            printf("Exiting program\r\n");
             evbLCD->clearBuffer();
             sprintf(txtstr,"Exiting Program");
             evbLCD->writeText(0, 4, font_6x8,txtstr,strlen(txtstr));
             exit(1);
         }
     } else {
-        printf("radio setup failed\n\r");
+        printf("radio setup failed\r\n");
         //exit(1);
     }
 
@@ -344,26 +344,26 @@
     // sets LED2 to 50% max current
     evbBackLight->setLEDCurrent(16);
 
-    printf("Start of Test\n\r");
+    printf("Start of Test\r\n");
 
     osDelay (500); // allows other threads to process
-    printf("shutdown LED:\n\r");
+    printf("shutdown LED:\r\n");
     evbBackLight->shutdown();
 
     osDelay (500); // allows other threads to process
-    printf("Turn on LED2\n\r");
+    printf("Turn on LED2\r\n");
     evbBackLight->setLEDCurrent(16);
 
     data = evbAccel->getWhoAmI();
-    printf("Accelerometer who_am_i value = %x \n\r", data);
+    printf("Accelerometer who_am_i value = %x \r\n", data);
 
     result = evbAccel->getStatus();
-    printf("status byte = %x \n\r", result);
+    printf("status byte = %x \r\n", result);
 
-    printf("Barometer who_am_i check = %s \n\r", evbBaro->testWhoAmI() ? "TRUE" : "FALSE");
+    printf("Barometer who_am_i check = %s \r\n", evbBaro->testWhoAmI() ? "TRUE" : "FALSE");
 
     result = evbBaro->getStatus();
-    printf("status byte = %x \n\r", result);
+    printf("status byte = %x \r\n", result);
 
     /*
      *  Setup the Accelerometer for 8g range, 14 bit resolution, Noise reduction off, sample rate 1.56 Hz
@@ -403,7 +403,7 @@
      * Check for PB1 press during network join attempt
      */
     if (exit_program) {
-        printf("Exiting program\n\r");
+        printf("Exiting program\r\n");
         evbLCD->clearBuffer();
         sprintf(txtstr,"Exiting Program");
         evbLCD->writeText(0, 4, font_6x8, txtstr, strlen(txtstr));
@@ -618,7 +618,7 @@
             }
         }
 
-        printf("finished iteration %d\n\r", loops++);
+        printf("finished iteration %d\r\n", loops++);
     }
 
     evbBaro->triggerOneShot();
@@ -629,10 +629,10 @@
     } while ((result & MPL3115A2::PTDR) == 0);
 
     baro_data = evbBaro->getAllData(true);
-    printf ("minBaro=%ld maxBaro=%ld minTemp=%d maxTemp=%d\n\r", baro_data._minbaro, baro_data._maxbaro,
+    printf ("minBaro=%ld maxBaro=%ld minTemp=%d maxTemp=%d\r\n", baro_data._minbaro, baro_data._maxbaro,
             baro_data._mintemp, baro_data._maxtemp);
 
-    printf("End of Test\n\r");
+    printf("End of Test\r\n");
 
     evbLCD->clearBuffer();
     sprintf(txtstr,"Exiting Program");