Diff: timer.cpp

Revision:

7:a784aa1aa27b

Parent:

5:08c6b4ca686a

Child:

9:f49dfeb4d3d5

--- a/timer.cpp	Sun May 04 19:47:58 2014 +0000
+++ b/timer.cpp	Sun May 04 19:58:58 2014 +0000
@@ -4,14 +4,14 @@
 Timer t;
  int count;
  int actualCount;
- float time;
+ //float time;
  int timeSwitch;
 DigitalOut myled(LED1);
 DigitalOut myled2(LED2);
 InterruptIn Hallsensor(p5);
 DigitalIn button(p14);
 
-C12832 lcd(p5, p7, p6, p8, p11);
+//C12832 lcd(p5, p7, p6, p8, p11);
 void pulses() {
     if(myled == 1) {
         myled = 0;
@@ -21,7 +21,7 @@
     count++;
     
 }
-int main() {
+void timer() {
   while(1){
       if(button){
        timeSwitch=timeSwitch+1;
@@ -32,8 +32,8 @@
          switch(timeSwitch) {
              case 1: {
                  
-                  lcd.cls();
-    lcd.printf("start");
+             //     lcd.cls();
+    //lcd.printf("start");
        Hallsensor.rise(&pulses);
       
         t.reset();
@@ -44,21 +44,21 @@
         
         case 2: {
             
-             lcd.cls();
-    lcd.printf("stop");
+      //       lcd.cls();
+    //lcd.printf("stop");
             
              t.stop();
           
        actualCount=count/2;
-       time= t.read()/actualCount;
+      // time= t.read()/actualCount;
           
             
             }
             
     case 3:{
          
-          lcd.cls();
-    lcd.printf("reset");
+         // lcd.cls();
+   // lcd.printf("reset");
          t.reset();
          timeSwitch=0;