diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-05-26 20:44:46 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-05-26 20:44:46 +0300 |
| commit | e6eaaf47fee4d7cbe44416e2d51e43ed183613cf (patch) | |
| tree | 3ac6221cddb2e1e6d6557ba0be5ae1ae9a5789fc /Software/Embedded_SW/Embedded/Modules | |
| parent | 6c0561d188a0279b6b46bbaf6c6e509d7bd69be1 (diff) | |
| parent | fd326204404ee0932ea465efcdd41e21fd7f2b49 (diff) | |
| download | Tango-e6eaaf47fee4d7cbe44416e2d51e43ed183613cf.tar.gz Tango-e6eaaf47fee4d7cbe44416e2d51e43ed183613cf.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 files changed, 29 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; } diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h index 9335a6d08..25336f50c 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h @@ -52,5 +52,7 @@ void MillisecLogClose(void); extern bool watchdogCriticalAlarm; +extern uint32_t Millisec_timerBase; + extern Task_Handle Millisecond_Task_Handle; #endif /* MODULES_CONTROL_MILLISECTASK_H_ */ diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index fff8596f8..30067afa9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -86,6 +86,24 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) response.has_progress = true; } else + if(request->amount == 0xdace)//test_dancer_responce_RTFU + { + test_dancer_flag = true; + + if(request->delay == 0x01) + { + test_dancer_direction = true; + } + else + if(request->delay == 0x00) + { + test_dancer_direction = false; + } + + response.progress = 0xdace; + response.has_progress = true; + } + else if(request->amount == 0x3EC) { if(request->delay == 0x01) |