Diff: main.cpp

Revision:

1:cf620653d56f

Parent:

0:6c41db68c857

Child:

4:1267e8fa59a3

--- a/main.cpp	Thu Feb 19 00:03:51 2015 +0000
+++ b/main.cpp	Fri Feb 20 17:53:43 2015 +0000
@@ -1,15 +1,12 @@
 #include "mbed.h"
 #include "mcp3208.h"
-// #include "BufferedSerial.h"
-
-// #include <string>
-// using namespace std;
 
 MCP3208 input1(dp2, dp1, dp6, dp9); //MCP3208(PinName mosi, PinName miso, PinName clk, PinName cs)
 // MCP3208 input1(p5, p6, p7, p8);
 
-Serial pc(dp16,dp15); //(USBTX, USBRX)
+Serial pc(dp16,dp15);
 // Serial pc(p9,p10);
+// Serial pc(USBTX, USBRX);
 
 Ticker datalog;
 
@@ -21,6 +18,7 @@
 char datastr5[5];
 
 // Credit: Erik Olieman
+// http://developer.mbed.org/questions/5149/Serial-port-on-LPC1114-is-slow/
 void intToString(char *buffer, int value)
 {
     int temp;
@@ -57,14 +55,14 @@
 
     datalog.attach_us(&log_data,1000); // 1000us = 1ms
 
-    intToString(datastr0,input1.binary(0));
-    intToString(datastr1,input1.binary(1));
-    intToString(datastr2,input1.binary(2));
-    intToString(datastr3,input1.binary(3));
-    intToString(datastr4,input1.binary(4));
-    intToString(datastr5,input1.binary(5));
+    while(1) {
+        intToString(datastr0,input1.binary(0));
+        intToString(datastr1,input1.binary(1));
+        intToString(datastr2,input1.binary(2));
+        intToString(datastr3,input1.binary(3));
+        intToString(datastr4,input1.binary(4));
+        intToString(datastr5,input1.binary(5));
 
-    while(1) {
         if(tickerActivated == true) {
             tickerActivated = false;
             pc.printf("%s,%s,%s,%s,%s,%s\n\r",datastr0,datastr1,datastr2,datastr3,datastr4,datastr5);