aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-07-15 14:32:42 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-07-15 14:32:42 +0300
commit3a674ea0ef5c71843bd876da3bb5e0b0f535110e (patch)
tree069f6411a4145dfa9ccfe0aa2f9a8758c92a8b8e /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
parentcc425e019d3a7d3494ac15ffe213b6b47b1c64ed (diff)
downloadTango-3a674ea0ef5c71843bd876da3bb5e0b0f535110e.tar.gz
Tango-3a674ea0ef5c71843bd876da3bb5e0b0f535110e.zip
idle task priorities upped. distance to spool added. some job related bugs
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 29e2cd3f6..fd86f0973 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -26,7 +26,8 @@
#include "drivers/Motors/Motor.h"
#include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
#include "modules/heaters/heaters.h"
-#include "modules/general/process.h"
+#include "modules/General/process.h"
+
////////////////////////////////State machine operation////////////////////////////////////
//the state machine operation is used to operate in runtime correct profile flow execution
//by recieved esign flow of the user from the UI
@@ -292,7 +293,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
int DancerId;
static int pooler_counter = 0;
int32_t TranslatedReadValue, avreageSampleValue = 0;
- double tempcalcspeed = 0;
+ //double tempcalcspeed = 0;
uint32_t calculated_speed;
double NormalizedError;
char Message[60];
@@ -546,18 +547,10 @@ uint32_t ThreadPreSegmentState(void *JobDetails)
float process_speed = dyeingspeed;
if (dyeingspeed == 0)
{
- LOG_ERROR (-1," unknown job speed");
+ LOG_ERROR (dyeingspeed," job speed zero");
return ERROR;
}
- /*if (JobTicket->processparameters)
- if (JobTicket->processparameters->dyeingspeed)
- process_speed= JobTicket->processparameters->dyeingspeed;
- else
- {
- LOG_ERROR (-1," unknown job speed");
- return ERROR;
- }
- */
+
SetOriginMotorSpeed(process_speed);
ThreadControlActive = true;
// set the new speed in the dryer motor to the speed of the new segment
@@ -606,7 +599,7 @@ void ThreadSegmentEnded(void)
}
void ThreadDistanceToSpoolEnded(void)
{
-
+ DistanceToSpoolReady(Module_Thread,ModuleDone);
}
double seglength = 0.0;
//********************************************************************************************************************
@@ -620,6 +613,14 @@ uint32_t ThreadSegmentState(void *JobDetails, int SegmentId)
}
//********************************************************************************************************************
+uint32_t ThreadDistanceToSpoolState(void )
+{
+ seglength = dryerbufferlength;
+ ThreadUpdateProcessLength (seglength,(void *)ThreadDistanceToSpoolEnded);
+ return OK;
+}
+
+//********************************************************************************************************************
uint32_t ThreadEndState(void *JobDetails)
{
int Motor_i;