aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Stubs_Handler
diff options
context:
space:
mode:
authorRonen Sberlo <ronen.s@twine-s.com>2020-08-31 15:51:06 +0300
committerRonen Sberlo <ronen.s@twine-s.com>2020-08-31 15:51:06 +0300
commitac87d8609897ff115261fb6995bb6e46d962015c (patch)
tree68a64c6174dbed1a11b12f0ae668c10c20b4319e /Software/Embedded_SW/Embedded/Modules/Stubs_Handler
parent5c19a9bef046ff080a9a7008bd4f39e2a13e4ccb (diff)
downloadTango-ac87d8609897ff115261fb6995bb6e46d962015c.tar.gz
Tango-ac87d8609897ff115261fb6995bb6e46d962015c.zip
arc head blowers PID
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Stubs_Handler')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index d983144f3..853f6913a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -814,8 +814,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
Task_sleep(2000);
//response.progress = Fan_Click_Info.Product_ID;
- //response.progress = Head_Fan_Tach[0];
- response.progress = HeadBlowersGetRPM(HEAD_FAN_RIGHT);
+ response.progress = Head_Fan_Tach[0];
response.has_progress = true;
}
@@ -824,27 +823,19 @@ 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 = HeadBlowersGetRPM(HEAD_FAN_LEFT);
+ response.progress = Head_Fan_Tach[1];
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)
{
- Fan_Id = (request->amount & 0x0000000F)-2;//0-5
- Fan_Speed = request->delay & 0x000000FF;
- Trigger_SetWHSFanSpeed(Fan_Id, Fan_Speed);
+ Trigger_SetWHSFanSpeed(((request->amount & 0x0000000F)-2) , request->delay & 0x000000FF);
Task_sleep(2000);
- Trigger_WHSReadAllFanTacho();
- Task_sleep(1000);
- //fan_tacho = WHS_Get_fan_tach( (request->amount & 0x0000000F)-2);
- fan_tacho = WHS_Fan_Tach_RPM[Fan_Id];
+ fan_tacho = WHS_Get_fan_tach( (request->amount & 0x0000000F)-2);
}
response.progress = fan_tacho;
response.has_progress = true;