aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2020-05-27 15:12:34 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2020-05-27 15:12:34 +0300
commit52956d3598177de58c0d742e374888cfb44276da (patch)
tree5a169d452bf75efd9a8b5a211fda95f1bd782916 /Software/Embedded_SW/Embedded/Modules/Control
parent87e6aa14ac8c5be4cac5b080c0f542d2ac3dd296 (diff)
parent985df74483b6813af53f799c5063d0865f6caabb (diff)
downloadTango-52956d3598177de58c0d742e374888cfb44276da.tar.gz
Tango-52956d3598177de58c0d742e374888cfb44276da.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 67a532e78..d334c9001 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -490,9 +490,15 @@ uint32_t MillisecLoop(uint32_t tick)
#ifdef HUNDRED_MICROSECONDS_DANCER_READ
SaveLogData();
#else
- Dancer_Data[FEEDER_DANCER] = Read_Dancer_Position(FEEDER_DANCER);
- Dancer_Data[POOLER_DANCER] = Read_Dancer_Position(POOLER_DANCER);
- Dancer_Data[WINDER_DANCER] = Read_Dancer_Position(WINDER_DANCER);
+
+ #ifdef test_RTFU_dancer
+ test_dancer_responce_RTFU();
+ #else
+ Dancer_Data[FEEDER_DANCER] = Read_Dancer_Position(FEEDER_DANCER);
+ Dancer_Data[POOLER_DANCER] = Read_Dancer_Position(POOLER_DANCER);
+ Dancer_Data[WINDER_DANCER] = Read_Dancer_Position(WINDER_DANCER);
+ #endif
+
#endif
return OK;
}