Diff: Interface/Interface.hpp

Revision:

30:a35f0ab97a65

Parent:

29:f3b1387c81f1

--- a/Interface/Interface.hpp	Wed Mar 13 11:34:39 2019 +0000
+++ b/Interface/Interface.hpp	Thu Apr 04 10:52:22 2019 +0000
@@ -18,8 +18,6 @@
 static DigitalOut Led_Select_Right(D3);
 static DigitalOut Led_Power(A0);
 static STEPPER_MOTOR STEPPER_MOTOR_1(D15,D14,D13,D12);
-static PwmOut Tendon_Power(PE_8); 
-
 
 class INTERFACE//This creates a class called Led
 { 
@@ -30,7 +28,8 @@
     INTERFACE(); //Constructor
     ~INTERFACE();//Destructor
     
-    void Interface_Init(int turns, int type_of_rig);//Set all values to 0 bar the passed in variable
+    void Interface_Init(int turns);//Set all values to 0 bar the passed in variable
+    void Interface_Serial();
     void Up();//Up Routine
     void Down();//Down Routine
     void Start_Stop();//Start / Stop Routine
@@ -44,14 +43,18 @@
     void Set_Twist_Go(bool Twist_Go);
     void Set_Anneal_Go(bool Anneal_Go);
     void Set_Test_Go(bool Test_Go);
+    void Set_Run_Go(bool Run_Go);
     void Set_Twist_Stop(bool Twist_Stop);
     void Set_Anneal_Stop(bool Anneal_Stop);
     void Set_Test_Stop(bool Test_Stop);
+    void Set_Run_Stop(bool Run_Stop);
     void Set_Select(int Select);
     void Set_Turns_Done(int Turns_Done);
     void Set_Turns_To_Do(int Turns_To_Do);
     void Set_Loop(int Loop);
-    void Set_On_Time(int On_Time);
+    void Set_Loops_done(int Loops_done);
+    void Set_On_Time(float On_Time);
+    void Set_Run_Once_On_Time(float Run_Once_On_Time);
     void Set_Off_Time(int Off_Time);
     void Set_Duty_Cycle(int Duty_Cycle);
     void Set_Power_Time(float Power_Time);
@@ -63,14 +66,18 @@
     bool Get_Twist_Go();
     bool Get_Anneal_Go();
     bool Get_Test_Go();
+    bool Get_Run_Go();
     bool Get_Twist_Stop();
     bool Get_Anneal_Stop();
     bool Get_Test_Stop();
+    bool Get_Run_Stop();
     int Get_Select();
     int Get_Turns_Done();
     int Get_Turns_To_Do();
     int Get_Loop();
-    int Get_On_Time();
+    int Get_Loops_done();
+    float Get_On_Time();
+    float Get_Run_Once_On_Time();
     int Get_Off_Time();
     int Get_Duty_Cycle();
     int Get_Power_Time();
@@ -86,22 +93,26 @@
     bool _Twist_Go;
     bool _Anneal_Go;
     bool _Test_Go;
+    bool _Run_Go;
     
     //Stop
     bool _Twist_Stop;
     bool _Anneal_Stop;
     bool _Test_Stop;
-    
+    bool _Run_Stop;
+        
     int _Select;
     int _Turns_Done;
     int _Turns_Todo;
+    int _Loops_done;
     int _Loop;
-    int _On_Time;
+    float _On_Time;
+    float _Run_Once_On_Time;
     int _Off_Time;//IN SECONDS
     int _Duty_Cycle;
     int _Power_Time;
     bool _Direction;
-    int _Type_of_Rig;
+
     
     //Mutex Locks
     Mutex _System_Running_mutex;
@@ -110,14 +121,18 @@
     Mutex _Twist_Go_mutex;
     Mutex _Anneal_Go_mutex;
     Mutex _Test_Go_mutex;
+    Mutex _Run_Go_mutex;
     Mutex _Twist_Stop_mutex;
     Mutex _Anneal_Stop_mutex;
     Mutex _Test_Stop_mutex;
+    Mutex _Run_Stop_mutex;
     Mutex _Select_mutex;
     Mutex _Turns_Done_mutex;
     Mutex _Turns_Todo_mutex;
     Mutex _Loop_mutex;
+    Mutex _Loops_done_mutex;
     Mutex _On_Time_mutex;//IN SECONDS
+    Mutex _Run_Once_On_Time_mutex;
     Mutex _Off_Time_mutex;
     Mutex _Duty_Cycle_mutex;
     Mutex _Power_Time_mutex;