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

2 files changed, 18 insertions, 5 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 66f1704b0..b16ba8b9e 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -75,19 +75,30 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
 
     }
     else
-        if((request->amount == 0xFAC) /*&& (request->delay == 0xFAC)*/) //Head Fan control
+    if((request->amount == 0xFAC0) /*&& (request->delay == 0xFAC)*/) //Head Fan control
     {
         //Head_Fan_PWM_Command[0] = (request->delay & 0xFF) ;
         //Test_Head_fan_Click();
 
         Head_Fan_PWM_Control(0, request->delay & 0xFF);
 
+
         //response.progress = Fan_Click_Info.Product_ID;
         response.progress = Head_Fan_Tach[0];
         response.has_progress = true;
 
     }
     else
+    if((request->amount == 0xFAC1) /*&& (request->delay == 0xFAC)*/) //Head Fan control
+    {
+
+            Head_Fan_PWM_Control(1, request->delay & 0xFF);
+
+            response.progress = Head_Fan_Tach[1];
+            response.has_progress = true;
+
+    }
+    else
         if((request->amount == 0x0A) && ((request->delay >= 0) && (request->delay < 8))) //read the midtank calibration
         {
             response.progress = Initial_Offset_A[request->delay];
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c
index 1c9b782c6..0fab4fdec 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_MidTankPressureSensor.c
@@ -38,17 +38,19 @@ void Stub_MidTankPressureSensorRequest(MessageContainer* requestContainer)
 
     StubMidTankPressureSensorResponse response =   STUB_MID_TANK_PRESSURE_SENSOR_RESPONSE__INIT;
 
-    response.midtankid = request->midtankid;
-    response.has_midtankid = true;
+
 
     if((MidTank_t)request->midtankid < NUM_OF_MIDTANKS)
     {
+        response.midtankid = request->midtankid;
+        response.has_midtankid = true;
         response.pressure = Read_MidTank_Pressure_Sensor((MidTank_t)request->midtankid);
     }
     else if((request->midtankid & 0x8000) ==  0x8000)//Head ADC
     {
-        request->midtankid = request->midtankid &~0x8000;
-        response.pressure = Read_Head_ADC((HEAD_ADC_t)request->midtankid); // Head Current
+        response.midtankid = request->midtankid - 0x8000;
+        response.has_midtankid = true;
+        response.pressure = Read_Head_ADC(response.midtankid); // Head Current
     }
 
     response.has_pressure = true;