aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-10-31 13:53:41 +0200
committerShlomo Hecht <shlomo@twine-s.com>2018-10-31 13:53:41 +0200
commit31f5d31a5413ab7e52f50cd173bfc558bd98f9b9 (patch)
tree05268a50b1c54cfec9ffd002b200dd8761f77eb6 /Software/Embedded_SW/Embedded/Modules/Thread
parent445589f04122c16ba297da01a3c773f00dd70b6a (diff)
parent6a5b9b8eb1a9923530106b92996d4a9028e83147 (diff)
downloadTango-31f5d31a5413ab7e52f50cd173bfc558bd98f9b9.tar.gz
Tango-31f5d31a5413ab7e52f50cd173bfc558bd98f9b9.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index b00e2fca4..eb04cadaf 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -8,8 +8,6 @@
#include "thread.h"
#include "drivers/Motors/Motor.h"
-#include <drivers/FPGA/FPGA_INTERRUPTS/fpga_interrupts.h>
-
#include "StateMachines/Printing/PrintingSTM.h"
#include "Modules/Control/Control.h"
#include "Modules/Control/MillisecTask.h"
@@ -23,8 +21,6 @@
#include "drivers/FPGA/FPGA_SPI_Comm.h"
#include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
-
-
bool Winder_ScrewHoming = false;
//bool Winder_Active = false;
@@ -132,7 +128,7 @@ uint32_t Winder_ScrewAtOffsetCallback(uint32_t deviceID, uint32_t BusyFlag)
ScrewNumberOfSteps = 0;
DirectionChangeCounter = 0;
REPORT_MSG(BusyFlag, "Winder_ScrewAtOffsetCallback");
- //Screw_Interrupt(true,ScrewFreeInterrupt);
+
PrepareReady(Module_Winder, ModuleDone);
return OK;
}