Diff: SETUP.hpp

Revision:

56:bc5345bc6650

Parent:

55:e0e684531825

Child:

57:aba1296e51b1

--- a/SETUP.hpp	Thu May 24 13:31:20 2018 +0000
+++ b/SETUP.hpp	Mon Jul 16 10:51:47 2018 +0000
@@ -8,27 +8,20 @@
 //Libraries and header includes
 #include "rtos.h"
 #include "LED.hpp"
-#include "LCD.hpp"
 #include "SERIAL.hpp"
 #include "TIME.hpp"
 #include "SERIAL_COMMANDS.hpp"
-#include "sample_hardware.hpp"
 #include "THREADS.hpp"
 #include "LED_LOGGING.hpp"
 #include "STEPPER_MOTOR.hpp"
 #include "SPI.hpp"
-#include "Algorithm.hpp"
+#include "ALGORITHM.hpp"
 #include <iostream>
 #include <bitset>
 
 using namespace std;
 //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
 
 LED Red_led(PE_15);
 LED Green_led(PB_11);
@@ -40,10 +33,7 @@
 void Serial_Comms_Data_Get();
 void Console_Output_ISR();
 void Rotate_Steps();
-void SW1TimeOutHandler();
-void SW1FallingEdge();
-void SW2TimeOutHandler();
-void SW2FallingEdge();
+
 //Object creations
 static STEPPER_MOTOR STEPPER_MOTOR_1(D0,D1);//step then direction
 static STEPPER_MOTOR STEPPER_MOTOR_2(D2,D3);//step then direction