Diff: main.cpp

Revision:

14:94f1b9e3eb43

Parent:

13:0a430559b488

Child:

15:4cd550c14f97

Child:

16:a1c97cd207eb

--- a/main.cpp	Mon Dec 01 23:17:43 2014 +0000
+++ b/main.cpp	Mon Dec 01 23:36:53 2014 +0000
@@ -136,7 +136,7 @@
     {
         wait_ms(observation_interval);
         printf("BPM: %d\r\n",beat*60000/observation_interval);
-        myPanel.printf("BPM: %02d\n\n",beat*60000/observation_interval);
+        myPanel.printf("BPM: %d\n\n",beat*60000/observation_interval);
         beat=0;
     }
 }
@@ -200,15 +200,16 @@
             setObservation = true;
             observation_temp = 0;
         }
-        else if (buffer == '\n')
+        else if (buffer == 13  && setObservation) //newline
         {
             observation_interval = observation_temp*1000;
             setObservation = false;
+         //   printf("observation interval now: %d\r\n",observation_interval);
         }
         else if (setObservation)
         {
             observation_temp *= 10;
-            observation_temp += (int) buffer;
+            observation_temp += buffer-48;
         
         }
       }