diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-08-31 09:11:14 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-08-31 09:11:14 +0300 |
| commit | 219a56d31bdf8872b3c377293d565496522436b9 (patch) | |
| tree | 1329d892096dea7432e1cb4774ae0900466f26d6 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | |
| parent | 66f00e5729e48811cc7d5d6f728988cd64f225e7 (diff) | |
| parent | d0f41f7f3e6ba31a285b63648449035eb147dc89 (diff) | |
| download | Tango-219a56d31bdf8872b3c377293d565496522436b9.tar.gz Tango-219a56d31bdf8872b3c377293d565496522436b9.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 | 2 |
1 files changed, 1 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 7ec0ed5e5..ab1ab77e6 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -1275,8 +1275,8 @@ uint32_t ThreadPrepareState(void *JobDetails) #ifndef TEST_PID_THREAD ControlIdtoMotorId[Motor_i] = AddControlCallback(NULL,ThreadControlCBFunction, eOneMillisecond,Control_Read_Dancer_Position,(IfTypeThread*0x100+Motor_i),ThreadMotorIdToDancerId[Motor_i],Motor_i); #endif -#endif } +#endif } HandleJobThreadControlParameters(JobTicket->threadparameters); //OVERRIDES CONFIGURATION PARAMETERS!!! |