Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 0 insertions, 26 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index 100fefbd8..69820e306 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -359,20 +359,6 @@ uint32_t GetControlLowDevice_i(void)
 }
 uint32_t ControlLoop(uint32_t tick)
 {
-    //call all modules control functions
-    //test dancers and speed encoders
-    //check all callback units (state machine waiting for completion of a change)
-    //uint32_t ControlDevice_i;
-    /*bool Ten_msTick, Hundred_msTick, Onesecond_Tick,Tick98,Tick998;
-    Ten_msTick      =   (tick%eTenMillisecond == 0)      ?true:false;
-    Hundred_msTick  =   (tick%eHundredMillisecond == 0)  ?true:false;
-//    Hundred_msTick  =   (tick%200 == 0)  ?true:false;
-    Onesecond_Tick  =   (tick%eOneSecond == 0)           ?true:false;
-    Tick98          =   (tick%eHundredMillisecond == 98) ?true:false;
-//    Tick98          =   (tick%200 == 199) ?true:false;
-    Tick998         =   (tick%eOneSecond == 996)         ?true:false;
-*/
-    //ROM_IntMasterDisable();
     //for (ControlDevice_i = 0; ControlDevice_i < MaxHighDevices;ControlDevice_i++)
     for (ControlDevice_i = 0; ControlDevice_i < MAX_TANGO_CONTROL_DEVICES;ControlDevice_i++)
     {
@@ -404,18 +390,6 @@ uint32_t ControlLoop(uint32_t tick)
 }
 uint32_t ControlLowLoop(uint32_t tick)
 {
-    //call all modules control functions
-    //test dancers and speed encoders
-    //check all callback units (state machine waiting for completion of a change)
-    //uint32_t Device_i;
-    //bool Ten_msTick, Hundred_msTick, Onesecond_Tick,Tick98,Tick998;
-    //Ten_msTick      =   (tick%eTenMillisecond == 0)      ?true:false;
-    //Hundred_msTick  =   (tick%eHundredMillisecond == 0)  ?true:false;
-    //Onesecond_Tick  =   (tick%eOneSecond == 0)           ?true:false;
-    //Tick98          =   (tick%eHundredMillisecond == 98) ?true:false;
-    //Tick998         =   (tick%eOneSecond == 996)         ?true:false;
-
-    //ROM_IntMasterDisable();
     for (ControlLowDevice_i = 0; ControlLowDevice_i < MAX_TANGO_CONTROL_DEVICES;ControlLowDevice_i++)
     {
         if (ControlArray[ControlLowDevice_i].ControlActive)