diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-04 22:47:14 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-04 22:47:14 +0200 |
| commit | e03ca60e3efeb8466f47c30920f6ab36306b3f74 (patch) | |
| tree | e3e9c13bd2858d92ddd291060a65f4774bcd8157 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | |
| parent | f17d39f37cac50861467e07a7bee40534d20100a (diff) | |
| parent | 12aa8a9ea3347b0c8365c14e172311d6b8ee6f38 (diff) | |
| download | Tango-e03ca60e3efeb8466f47c30920f6ab36306b3f74.tar.gz Tango-e03ca60e3efeb8466f47c30920f6ab36306b3f74.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_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.c | 4 |
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; } |