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

1 files changed, 10 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index fed1311bd..3b9311b77 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -26,29 +26,28 @@
 #include <inc/hw_memmap.h>
 
 
-bool Winder_ScrewHoming = false;
-
 #define MAX_WINDER_SPEED_CALCULATION 200
+
 uint32_t Winder_ScrewAtOffsetCallback(uint32_t deviceID, uint32_t BusyFlag);
 uint32_t Winder_PrepareStage2(uint32_t deviceID, uint32_t ReadValue);
+void ScrewTimerInterruptInit(void);
+void ScrewsStopControlTimer (void);
+void ScrewsStartControlTimer (void);
 
-bool ScrewCurrentDirection = false;  //holds current screw direction
+bool     Winder_ScrewHoming = false;
+bool     ScrewCurrentDirection = false;  //holds current screw direction
 uint32_t ScrewDirectionChangeCounter = 1; //holds the current number of runs of the screw  - will be used to build the cone
 uint32_t CalculationDirectionChangeCounter = 1; //holds the current number of runs of the screw  - will be used to build the cone
 uint16_t WinderMotorSpeed[MAX_WINDER_SPEED_CALCULATION];
 uint16_t WinderMotorSpeedCounter = 0;
-bool WinderMotorSpeedRollOver = false;
-double ScrewSpeed = 0;
-double ScrewRunningTime = 0;
+bool     WinderMotorSpeedRollOver = false;
+double   ScrewSpeed = 0;
+double   ScrewRunningTime = 0;
 uint32_t ScrewNumberOfSteps = 0;     //holds the current number of steps for the next screw run - will be used to build the cone
-bool SCREW_TimerActivated = false;
-//ScrewSpeed
+bool     SCREW_TimerActivated = false;
 uint32_t ScrewControlId = 0xFF;
 
 InternalWinderConfigStruc InternalWinderCfg = {0};
-void ScrewTimerInterruptInit(void);
-void ScrewsStopControlTimer (void);
-void ScrewsStartControlTimer (void);
 
 uint32_t Winder_Init(void)
 {