aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-10-24 09:58:14 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-10-24 09:58:14 +0300
commit63fec02910da55db999402121559e20d9bc2ab56 (patch)
treedecc3dacd47b42a6fdf3efaa9aceb544e388ed0e /Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
parent8e9c53625339326ef5477c4a9222ffbbf01b5d50 (diff)
parent0f2a4cf2802adc0dc177656dc1f27967bb436a9f (diff)
downloadTango-63fec02910da55db999402121559e20d9bc2ab56.tar.gz
Tango-63fec02910da55db999402121559e20d9bc2ab56.zip
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index c7dd4f7ae..effa8b2c7 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -8,6 +8,8 @@
#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"
@@ -21,6 +23,8 @@
#include "drivers/FPGA/FPGA_SPI_Comm.h"
#include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
+
+
bool Winder_ScrewHoming = false;
//bool Winder_Active = false;
@@ -128,7 +132,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;
}
@@ -338,6 +342,7 @@ uint32_t Winder_End(void)
RemoveControlCallback(ScrewControlId,ScrewDirectionChange);
CurrentControlledSpeed[SCREW_MOTOR] = 0;
pend = MillisecFlushMsgQ(HARDWARE_MOTOR_TYPE__MOTO_SCREW);
+ //Screw_Interrupt(false,NULL);
return MotorStop (HARDWARE_MOTOR_TYPE__MOTO_SCREW,Hard_Hiz);
}
void Winder_ScrewHomeLimitSwitchInterrupt(void)