aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread
diff options
context:
space:
mode:
authorRonen Sberlo <ronen.s@twine-s.com>2020-08-30 11:10:48 +0300
committerRonen Sberlo <ronen.s@twine-s.com>2020-08-30 11:10:48 +0300
commit916b852f7ad8018f883f3ae8a5b119be0cc12883 (patch)
tree035409731259848d98d53a9f6d1ababc1c7df96a /Software/Embedded_SW/Embedded/Modules/Thread
parentb91e38b4265ffe413d9b54aabb3e17d8cd150570 (diff)
downloadTango-916b852f7ad8018f883f3ae8a5b119be0cc12883.tar.gz
Tango-916b852f7ad8018f883f3ae8a5b119be0cc12883.zip
Tunnel entrances temperature read
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c3
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 852389001..2b6492dab 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -347,8 +347,9 @@ int flipflop = 0;
uint32_t motspeed;
float speedf;
int WinderCalculation = 0;
+#ifdef FOUR_WINDERS
int MotorOrder[4] = {HARDWARE_MOTOR_TYPE__MOTO_SCREW,SCREW_2_Motor,SCREW_3_Motor,SCREW_4_Motor};
-
+#endif
uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
{
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!!!