diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-16 09:29:44 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-16 09:29:44 +0300 |
| commit | beed152bc9c9c004991b414613fef17e06737962 (patch) | |
| tree | 0aac90d453d846b6b1f2195f7211a3dc07280e8d /Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | |
| parent | 230606f80543e12f04f7ca674a208de9d78ad3a1 (diff) | |
| parent | d376387fa28a2091a21e2fc7193812d1f8a40ef2 (diff) | |
| download | Tango-beed152bc9c9c004991b414613fef17e06737962.tar.gz Tango-beed152bc9c9c004991b414613fef17e06737962.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 2bd03f406..e40be86a0 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -11,9 +11,9 @@ #include "StateMachines/Printing/PrintingSTM.h" #include "Modules/Control/Control.h" -#include "Common/report/report.h" +#include "modules/General/process.h" -#include "modules/general/process.h" +#include "Common/report/report.h" #include "drivers/FPGA/FPGA.h" @@ -226,13 +226,13 @@ uint32_t WinderPresegmentReady(uint32_t deviceID, uint32_t ReadValue) uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId) { JobTicket* JobTicket = JobDetails; - float screw_speed = 0; float RotationsPerSecond; + int process_speed = dyeingspeed; if (dyeingspeed == 0) { - LOG_ERROR (-1," unknown job speed"); + LOG_ERROR (dyeingspeed," job speed zero"); return ERROR; } |