aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-31 08:56:49 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-31 08:56:49 +0300
commitd0f41f7f3e6ba31a285b63648449035eb147dc89 (patch)
tree33e71986c4655ff2472a2037e69b0b20119e3ce5 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
parent1f63d0fcaf1ec52c6fb8785fe501f205359dc87a (diff)
parentd4ae04f8922ce04c1dbaf375176677a91afba386 (diff)
downloadTango-d0f41f7f3e6ba31a285b63648449035eb147dc89.tar.gz
Tango-d0f41f7f3e6ba31a285b63648449035eb147dc89.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.c2
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!!!