chad
Dependencies: MCP23017 WattBob_TextLCD mbed-rtos mbed
Diff: main.h
- Revision:
- 14:ede0e7ed2745
- Parent:
- 13:ad04937ca366
- Child:
- 15:85616bc0e2ae
diff -r ad04937ca366 -r ede0e7ed2745 main.h --- a/main.h Tue Mar 07 22:32:06 2017 +0000 +++ b/main.h Wed Mar 08 15:36:57 2017 +0000 @@ -2,7 +2,7 @@ #include "MCP23017.h" #include "WattBob_TextLCD.h" #include "SDFileSystem.h" -#include "rtos.h" +//#include "rtos.h" #define BACK_LIGHT_ON(INTERFACE) INTERFACE->write_bit(1,BL_BIT) #define BACK_LIGHT_OFF(INTERFACE) INTERFACE->write_bit(0,BL_BIT) @@ -11,7 +11,11 @@ extern WattBob_TextLCD *lcd; // pointer to 2*16 character LCD object extern FILE *fp; // pointer to uSD object -extern Timer timer; // Frequency Timer +//extern Ticker ticker; +//extern Timer timer; // Frequency Timer +//extern Timer T5; + +void CycExec(void); void Task1(void); void Task2(void); @@ -20,33 +24,36 @@ void Task5(void); void Task6(void); void Task7(void); + +void PosEdge(void); +void NegEdge(void); //void Task8() // Global Variables // Constant Declaration -extern const int SampFreq; // Sampling Frequency -extern const int WD; // Watchdog pulse length +extern const int SampFreq; // Sampling Frequency +extern const int WD; // Watchdog pulse length // Variable Declaration -extern long int tck; // Used to define what task is called (CycExec) +//extern int tck; // Used to define what task is called (CycExec) -extern bool FqIn; // Frequency input boolean -extern int period; // Frequency timer variable (Frequency Check) -extern int freq; // Frequency return variable (Frequency Check) +extern int FqIn; // Frequency input +extern int period; // Frequency timer variable (Frequency Check) +extern int freq; // Frequency return variable (Frequency Check) -extern bool DSIn; // Switch Input boolean +extern int DSIn; // Switch Input boolean extern int switch_state; extern int WD_pulse; -extern int A1_in; // Analogue 1 input variable -extern int A2_in; // Analogue 2 input variable -extern int A1_val; // Analogue 1 return variable (Analogue In) -extern int A2_val; // Analogue 2 return variable (Analogue In) +extern int A1_in; // Analogue 1 input variable +extern int A2_in; // Analogue 2 input variable +extern int A1_val; // Analogue 1 return variable (Analogue In) +extern int A2_val; // Analogue 2 return variable (Analogue In) -extern bool DS_sIn; // Shutdown Switch boolean -extern int error_code; // Error code variable +extern int DS_sIn; // Shutdown Switch +extern int error_code; // Error code variable -extern int logcount; // Keep track of log number +extern int logcount; // Keep track of log number