remove WHS_FAN prints

add print to tachboard avarage flow

2 files changed, 51 insertions, 50 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index e5064ef70..a36a19928 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -720,7 +720,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
         }
         Trigger_WHS_PT100_Read_All();
         Trigger_WHS_MAX11614_Read_allADC();
-//    WHS_Blower_Avarege_ORF1(); //drier
+        WHS_Blower_Avarege_ORF1(); //drier
         WHS_Blower_Avarege_ORF3(); //head
         Trigger_WHSReadAllFanTacho ();
     }
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 677d3fa5f..c84566659 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -107,64 +107,65 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         }
     }
     else
-    if((request->amount == 0x3E8) && (request->delay <= 0x0fff))// set WHS Blower speed 0x00-0xfff
-    {
-        if (WHS_Type == WHS_TYPE_NEW)
+        if((request->amount == 0x3E8) && (request->delay <= 0x0fff))// set WHS Blower speed 0x00-0xfff
         {
-            Trigger_SetWHSBlowerVoltage (request->delay);
-            response.progress = 0;
-            response.has_progress = true;
-        }        //Trigger_WHS_Set_Volt_Blower_Control(request->delay);
-    }
+            if (WHS_Type == WHS_TYPE_NEW)
+            {
+                Trigger_SetWHSBlowerVoltage (request->delay);
+                response.progress = 0;
+                response.has_progress = false;
+            }
+        }
     else
         if (request->amount == 0x3E7) // set WHS Blower speed by Q value
         {
              if (WHS_Type == WHS_TYPE_NEW)
              {
-                 Trigger_WHS_Set_Blower_Control_Closed_Loop (request->delay);
+                 WHS_Set_Blower_Control_Closed_Loop (request->delay);
                  response.progress = 0;
-                 response.has_progress = true;
-             }        //Trigger_WHS_Set_Volt_Blower_Control(request->delay);
+                 response.has_progress = false;
+             }
         }
-    else if(request->amount == 0x3EA)
-    {
-        uint16_t tempu16 = 0;
-       if (WHS_Type == WHS_TYPE_NEW)
-       {
-           switch(request->delay )// set WHS Blower speed 0x00-0xfff
-           {
-           case 0:
-               get_orf_1(&tempu16);
-               break;
-           case 1:
-               get_orf_2(&tempu16);
-               break;
-           case 2:
-               get_orf_3(&tempu16);
-               break;
-           case 3:
-               get_vlev1(&tempu16);
-               break;
-           case 4:
-               get_vlev2(&tempu16);
-               break;
-           case 5:
-               get_gas_out(&tempu16);
-               break;
-           case 6:
-               get_cur_fan(&tempu16);
-               break;
-           case 7:
-               get_cur_vlv1(&tempu16);
-               break;
-           case 8:
-               tempu16 = 0;  //get_cur_vlv2(&tempu16);
-               break;
-           default :
-               tempu16 = 0x500;  //get_cur_vlv2(&tempu16);
-               break;
+    else
+        if(request->amount == 0x3EA)
+        {
+            uint16_t tempu16 = 0;
+            if (WHS_Type == WHS_TYPE_NEW)
+            {
+                switch(request->delay )// set WHS Blower speed 0x00-0xfff
+                {
+                    case 0:
+                        get_orf_1(&tempu16);
+                        break;
+                    case 1:
+                        get_orf_2(&tempu16);
+                        break;
+                    case 2:
+                        get_orf_3(&tempu16);
+                        break;
+                    case 3:
+                        get_vlev1(&tempu16);
+                        break;
+                    case 4:
+                        get_vlev2(&tempu16);
+                        break;
+                    case 5:
+                        get_gas_out(&tempu16);
+                        break;
+                    case 6:
+                        get_cur_fan(&tempu16);
+                        break;
+                    case 7:
+                        get_cur_vlv1(&tempu16);
+                        break;
+                    case 8:
+                        tempu16 = 0;  //get_cur_vlv2(&tempu16);
+                        break;
+                    default :
+                        tempu16 = 0x500;  //get_cur_vlv2(&tempu16);
+                        break;
+                }
            }
-       }
        response.progress = (double)tempu16;
        response.has_progress = true;
     }