diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-30 19:27:52 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-30 19:27:52 +0300 |
| commit | b76f8564a5fc2904c8de299e1650b41af40a49ae (patch) | |
| tree | b862102d1f94e2640d5f2e7d25c1e6ffd054e097 /Software/Embedded_SW/Embedded/Modules | |
| parent | 25da934cba7a950fcc585fe0518521cbd157999e (diff) | |
| parent | f35997d7f19ffbc4f4f99dbe32ca83207e570e9c (diff) | |
| download | Tango-b76f8564a5fc2904c8de299e1650b41af40a49ae.tar.gz Tango-b76f8564a5fc2904c8de299e1650b41af40a49ae.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index 853f6913a..d983144f3 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -814,7 +814,8 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) Task_sleep(2000); //response.progress = Fan_Click_Info.Product_ID; - response.progress = Head_Fan_Tach[0]; + //response.progress = Head_Fan_Tach[0]; + response.progress = HeadBlowersGetRPM(HEAD_FAN_RIGHT); response.has_progress = true; } @@ -823,19 +824,27 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) { Trigger_Head_Fan_Control(HEAD_FAN_LEFT, request->delay & 0xFF); Task_sleep(2000); - response.progress = Head_Fan_Tach[1]; + //response.progress = Head_Fan_Tach[1]; + response.progress = HeadBlowersGetRPM(HEAD_FAN_LEFT); response.has_progress = true; } else if ((request->amount & 0x0000FFF0) == 0xFAC0) //WHS Fan control { uint16_t fan_tacho = 0; + WHS_fan_num Fan_Id; + uint8_t Fan_Speed; if (WHS_Type == WHS_TYPE_NEW) { - Trigger_SetWHSFanSpeed(((request->amount & 0x0000000F)-2) , request->delay & 0x000000FF); + Fan_Id = (request->amount & 0x0000000F)-2;//0-5 + Fan_Speed = request->delay & 0x000000FF; + Trigger_SetWHSFanSpeed(Fan_Id, Fan_Speed); Task_sleep(2000); - fan_tacho = WHS_Get_fan_tach( (request->amount & 0x0000000F)-2); + Trigger_WHSReadAllFanTacho(); + Task_sleep(1000); + //fan_tacho = WHS_Get_fan_tach( (request->amount & 0x0000000F)-2); + fan_tacho = WHS_Fan_Tach_RPM[Fan_Id]; } response.progress = fan_tacho; response.has_progress = true; |