Diff: SETUP.hpp

Revision:

16:9f98ec0ededb

Parent:

14:63998be3d43c

Child:

17:68b3fdabe4c5

--- a/SETUP.hpp	Mon Feb 11 20:43:39 2019 +0000
+++ b/SETUP.hpp	Mon Feb 11 22:03:47 2019 +0000
@@ -12,24 +12,24 @@
 #include "iostream"
 //Libraries and header includes
 #include "rtos.h"
+#include "STEPPER_MOTOR.hpp"
+#include "Interface.hpp"
 
-#include "STEPPER_MOTOR.hpp"
+InterruptIn button_up(D8);    //D8//Increment Button
+InterruptIn button_down(A1);  //A1//Decrement Button
+InterruptIn button_start(D9); //D9//START / STOP BUTTON
+InterruptIn button_funct(A3); //A3//Function Button
+InterruptIn button_select(A4);//A4//Select Button
+    
 //Digital Outputs
 DigitalOut led1(LED1);
 DigitalOut led2(LED2);
-
 void up_thread_function();
 void down_thread_function();
 void start_thread_function();
 void function_thread_function();
 void select_thread_function();
 
-
-InterruptIn button_up(D8);
-InterruptIn button_down(A1);    // These setup the button interupts
-InterruptIn button_start(D9);   // START / STOP BUTTON
-InterruptIn button_funct(A3);// Random pin  CHANGE FOR FUNCTION BUTTON
-InterruptIn button_select(A4);// Random pin CHANGE FOR SELECT BUTTON
 //Thread Setups
 Thread lcd_thread;
 Thread led_thread;
@@ -42,24 +42,4 @@
 TextLCD lcd(D0,D1,D4,D5,D6,D7); // rs, e, d4-d7
 Serial pc(USBTX, USBRX);         //Define serial namespace so the serial comms can be printed to
 
-PwmOut Tendon_Power(PE_8); 
-
-//VARIABLE DEFINITIONS
-int No_Of_Rotations;
-int Function;
-bool Twist_Go;
-bool Anneal_Go;
-bool Test_Go;
-bool Select;
-
-int turns_done;
-int turns_todo;
-int Loop;
-int Wait_Time;//IN SECONDS
-
-int Duty_Cycle;
-int Power_Time;
-
-
-static STEPPER_MOTOR STEPPER_MOTOR_1(D15,D14,D13,D12);
 #endif 
\ No newline at end of file