Diff: main.h

Revision:

17:bc25d5f47bab

Parent:

16:bebcc7d24f3e

diff -r bebcc7d24f3e -r bc25d5f47bab main.h
--- a/main.h	Fri Mar 10 18:50:37 2017 +0000
+++ b/main.h	Mon Mar 13 14:51:55 2017 +0000
@@ -11,9 +11,15 @@
 extern  WattBob_TextLCD     *lcd;       // pointer to 2*16 character LCD object
 extern  FILE                *fp;        // pointer to uSD object
 
-extern DigitalIn    Fq;
+extern  DigitalIn   Fq;
+extern  DigitalIn   DS;              // Digital switch input
+extern  DigitalIn   DS_s;            // Digital shutdown switch
+extern  DigitalOut  WD_pulse;   // Watchdog Pulse
 
-//extern Ticker ticker;
+
+extern  AnalogIn    A1_;              // Analogue input to be filtered
+extern  AnalogIn    A2_;              // Analogue input to be filtered
+
 extern Ticker ticker;
 extern Timer timer;                    // Frequency Timer
 extern Timer T5;
@@ -24,13 +30,12 @@
 void Task2(void);
 void Task3(void);
 void Task4(void);
-void Task5(void);
+void Task5a(void);
+void Task5b(void);
 void Task6(void);
 void Task7(void);
 
-void PosEdge(void);
-void NegEdge(void);
-//void Task8()
+void Task8(void);
 
 
 //  Global Variables
@@ -39,24 +44,17 @@
 extern const int WD;                // Watchdog pulse length
 
 // Variable Declaration
-//extern int tck;                // Used to define what task is called (CycExec)
+extern float freq;
 
-extern int FqIn;                    // Frequency input 
-extern float period;                  // Frequency timer variable (Frequency Check)
-extern float freq;                    // Frequency return variable (Frequency Check)
-
-extern int DSIn;                    // Switch Input boolean
 extern int switch_state;
 
-extern int WD_pulse;
-
-
-extern float A1_in;                   // Analogue 1 input variable
-extern float A2_in;                   // Analogue 2 input variable
+extern float A1_In;
+extern float A2_In;
 extern float A1_val;                  // Analogue 1 return variable (Analogue In)
 extern float A2_val;                  // Analogue 2 return variable (Analogue In)
 
-extern int DS_sIn;                  // Shutdown Switch 
+extern int T5_chk;
+
 extern int error_code;              // Error code variable
 
 extern int logcount;                // Keep track of log number