Diff: SETUP.hpp

Revision:

52:99915f5240b2

Parent:

48:244d6d81bb52

Child:

53:71f59e195f06

--- a/SETUP.hpp	Tue Jan 09 15:15:08 2018 +0000
+++ b/SETUP.hpp	Tue Jan 09 22:27:49 2018 +0000
@@ -1,23 +1,32 @@
-#ifndef _SETUP_HPP_ //SETUP header guard
-#define _SETUP_HPP_
-//File includes
+/*
+Setup file for the main
+*/
+
+#ifndef SETUP_HPP//Header Guards Prevents Multiple includes
+#define SETUP_HPP
+
+//Libraries and header includes
 #include "rtos.h"
 #include "LED.hpp"
 #include "DATA.hpp"
 #include "LCD.hpp"
 #include "SERIAL.hpp"
 #include "TIME.hpp"
-#include <iostream>
-
-//Signal definitions
-
-//Mutex Locks
-
+#include "NETWORK.hpp"
+#include "FIFO.hpp"
+#include "SD_CARD.hpp"
+#include "SERIAL_COMMANDS.hpp"
+#include "SAMPLE.hpp"
+#include "THREADS.hpp"
+#include "LED_LOGGING.hpp"
 
 //Time definitions
 #define TimerInterval 15 //This is in seconds
+#define SW1_SW2_Timeout_Time 15 //This is in seconds
 
-
+//Time outs
+Timeout SW1TimeOut;             //Used to prevent lockups
+Timeout SW2TimeOut;             //Used to prevent lockups
 
 //Forward Declarations of functions
 
@@ -27,25 +36,10 @@
 void Serial_Comms_Data_Get();
 void Sampling_ISR();
 void Console_Output_ISR();
-//Declarations of Varialbes
 
-float Sample_Rate;
-int LCD_sprintf;
-double temp = 0;
-double pressure = 0;
-double lux = 0;
-string buffer_time = 0;
-char buffer[32];
-char scom_time_buffer[32];
-char msel_time_buffer[32];
+void SW1TimeOutHandler();
+void SW1FallingEdge();
+void SW2TimeOutHandler();
+void SW2FallingEdge();
 
-
-
-//Time out Declarations
-Timeout sw1TimeOut;//Used to prevent switch bounce
-Timeout sw2TimeOut;//Used to prevent switch bounce
-
-
-
-using namespace std;//Set default namespace enables use of iostream with serial comms
 #endif 
\ No newline at end of file