Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

3 files changed, 15 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 9d794bcd7..6d92e06c9 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -755,6 +755,11 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 PressureCalc[Disp_i] = MillisecCalculatePressures(Disp_i);
             }
         }
+#ifdef Use_WHS_Card
+    Trigger_WHS_PT100_Read_All();
+    Trigger_WHS_MAX11614_Read_allADC();
+#endif
+
     }
     if (OneMinute_Tick)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index cead9b0e9..c31e21e23 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -280,8 +280,8 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
     {
         uint16_t fan_tacho = 0;
 
-        WHS_set_fan_speed(((request->amount & 0x0000000F)-1) , request->delay & 0x000000FF);
-        WHS_Read_fan_tach(((request->amount & 0x0000000F)-1),  &fan_tacho);
+        Trigger_SetWHSFanSpeed(((request->amount & 0x0000000F)-1) , request->delay & 0x000000FF);
+//        getWHSFanTacho(((request->amount & 0x0000000F)-1),  &fan_tacho);
         response.progress = fan_tacho;
         response.has_progress = true;
     }
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
index db6bd7da1..c42546d1b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
@@ -52,7 +52,14 @@ bool newWHS_init(void)
 //    status |= Test_WHS_PT100_ADC();
 //  //test_9555();
 //    status |= WHS_I2C_EEprom_Write_Ch_shai_taest();
-    return status;
+
+    Set_All_WHS_Fans(0xFF);
+ //   delayms(4000);
+    //Trigger_SetWHSBlowerVoltage (0x0C00);
+
+
+
+return status;
 }