Diff: Tasks.h

Revision:

3:c611b9bb5770

Parent:

2:22ebabd78084

Child:

4:b85bc0d810e1

diff -r 22ebabd78084 -r c611b9bb5770 Tasks.h
--- a/Tasks.h	Mon Feb 15 22:30:54 2016 +0000
+++ b/Tasks.h	Wed Feb 17 10:22:50 2016 +0000
@@ -19,11 +19,13 @@
 #ifndef _TASKS_H_
 #define _TASKS_H_
 
-
 // Global definitions
 #define HIGH 1
 #define LOW 0
 
+#define TRUE 1
+#define FALSE 0
+
 // Task 1 definitions
 #define WATCHDOG_PULSE_WIDTH 15
 
@@ -32,6 +34,7 @@
 // Task 3 definitions
 
 // Task 4 definitions
+#define NUM_ANALOG_SAMPLES 4
 
 // Task 5 definitions
 
@@ -49,7 +52,6 @@
     int MeasureFreq();
         
 private:
-    
     DigitalIn *_squareWaveIn;
         
 };
@@ -61,9 +63,9 @@
 {
 public:
     Task2(PinName digitalInCheckPin);
-        
+    bool digitalInState();
+    
 private:
-    
     DigitalIn *_digitalInCheck;
         
 };
@@ -87,48 +89,49 @@
 class Task4
 {
 public:
-    Task4(PinName digitalInCheckPin);
-        
-private:
+    Task4(PinName Analog1Pin,PinName Analog2Pin);
+    float *returnAnalogReadings();
     
-    DigitalIn *_digitalInCheck;
-        
-};
-
-/* ==================================== Task 5 ==================================== */
-// Display outputs to LCD
-class Task5
-{
-public:
-    Task5();
-        
 private:
-    
-        
+    AnalogIn *_AnalogIn1;
+    AnalogIn *_AnalogIn2;        
 };
 
-/* ==================================== Task 6 ==================================== */
-// Logical checks
-class Task6
-{
-public:
-    Task5();
-        
-private:
-    
-        
-};
-
-/* ==================================== Task 7 ==================================== */
-// Save data to SD Card
-class Task7
-{
-public:
-    Task7();
-        
-private:
-    
-        
-};
+//
+///* ==================================== Task 5 ==================================== */
+//// Display outputs to LCD
+//class Task5
+//{
+//public:
+//    Task5();
+//        
+//private:
+//    
+//        
+//};
+//
+///* ==================================== Task 6 ==================================== */
+//// Logical checks
+//class Task6
+//{
+//public:
+//    Task5();
+//        
+//private:
+//    
+//        
+//};
+//
+///* ==================================== Task 7 ==================================== */
+//// Save data to SD Card
+//class Task7
+//{
+//public:
+//    Task7();
+//        
+//private:
+//    
+//        
+//};
 
 #endif