From d5c3c24d71202353596dd7d28048ecf7ff74bd5c Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Sun, 30 Aug 2020 14:25:17 +0300 Subject: Calculate WHS fan tacho [RPM] + Update the stub --- .../Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index 853f6913a..4cae0f786 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -830,12 +830,19 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) 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; -- cgit v1.3.1 From f35997d7f19ffbc4f4f99dbe32ca83207e570e9c Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Sun, 30 Aug 2020 15:22:53 +0300 Subject: Send RPM in head fan's stub --- Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index 4cae0f786..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,7 +824,8 @@ 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 -- cgit v1.3.1