aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2020-03-05 16:43:50 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2020-03-05 16:43:50 +0200
commit937b2a545fc7405f4673377b209caf22f00375b7 (patch)
tree2ad1eedef4cf0cf428f4a312648f0d453865b1f0 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
parent60988675685060adfc98b2d071c3e1df1e10fd87 (diff)
parent1834b13df30bcf71aab363f9e504c4e79b3f2224 (diff)
downloadTango-937b2a545fc7405f4673377b209caf22f00375b7.tar.gz
Tango-937b2a545fc7405f4673377b209caf22f00375b7.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 8cd917a8d..91f655171 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -459,6 +459,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
//read value is the dancer angle
int i,index=MAX_THREAD_MOTORS_NUM,len;
+ //int len;
int DancerId;
int32_t TranslatedReadValue, avreageSampleValue = 0;//,avreageMotorSampleValue = 0;
//double tempcalcspeed = 0;
@@ -786,6 +787,7 @@ uint32_t HandleJobThreadControlParameters(ThreadParameters* ThreadParams)
if(ThreadParams->bypassrockers)
Thread_Rockers_Bypass = true;
+ return OK;
}
//********************************************************************************************************************
uint32_t ThreadPrepareState(void *JobDetails)
@@ -1187,7 +1189,7 @@ char Endstr[150];
if (PoolerSpeedControlId != 0xFF)
{
if(RemoveControlCallback(PoolerSpeedControlId,PoolerThreadLengthCBFunction)!=OK)
- ReportWithPackageFilter(ThreadFilter,"Remove Control Failed.",__FILE__,__LINE__,(int)Motor_i,RpError,(int)PoolerSpeedControlId,0);
+ ReportWithPackageFilter(ThreadFilter,"Remove Control Failed.",__FILE__,__LINE__,(int)PoolerThreadLengthCBFunction,RpError,(int)PoolerSpeedControlId,0);
PoolerSpeedControlId = 0xFF;
}