Diff: main.cpp

Revision:

7:d9f86e1b8185

Parent:

4:4bb228d1f6c2

Child:

9:539c51b7db52

diff -r 4bb228d1f6c2 -r d9f86e1b8185 main.cpp
--- a/main.cpp	Sat Feb 15 18:37:26 2014 +0000
+++ b/main.cpp	Wed Feb 19 17:33:00 2014 +0000
@@ -1,18 +1,12 @@
 #include "Function.h"
  
 int main(){
-    led1=0;
-    led2=0;
-    led3=0;
-    led4=0;
     Init_LCD();
-    TimeA.start();
-    CallFunction1.attach(&job1,1);
-    CallFunction2.attach(&job2,0.4);
-    CallFunction3.attach(&job3,0.8);
-    CallFunction4.attach(&job4,2);
-    CallFunction5.attach(&job5,1.8);
-    CallFunction6.attach(&job6,1.5);
-    CallFunction7.attach(&job7,5);
-   
+    CallFreqMsur.attach(&FreqMsur,1);      //Measure the frequency every 400mS
+    CallReadDigitalin.attach(&ReadDigitalin,0.4);    //Read TWO digital inputs every 400mS
+    CallReadAnalogin.attach(&ReadAnalogin,0.8);    //Read TWO analogue inputs every 800mS
+    CallDisplay.attach(&Display,2);      //Display on the LCD every 2 seconds
+    CallInputCheck.attach(&InputCheck,1.8);    //Input Check every 1.8 second
+    CallBinaryCounter.attach(&BinaryCounter,1.5);    //Binary increment every 1.5 second
+    CallLogFile.attach(&LogFile,5);      //Log the values every 5 seconds
 }
\ No newline at end of file