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

2 files changed, 12 insertions, 6 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index cdcecaa2a..19392c754 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -197,12 +197,18 @@
         }
         else
         {
-            WHS_Set_SetPoint_Q_value(headairflow/2);
-            Turn_the_Blower_On();//Turn on with the Default_Voltage
-            if (BlowerCfg.heatingvoltage)
-                Control_Voltage_To_Blower(BlowerCfg.heatingvoltage);
+            if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+            {
+                WHS_Set_SetPoint_Q_value(headairflow/2);
+            }
             else
-                Control_Voltage_To_Blower(BlowerCfg.voltage-500);
+            {
+                Turn_the_Blower_On();//Turn on with the Default_Voltage
+                if (BlowerCfg.heatingvoltage)
+                    Control_Voltage_To_Blower(BlowerCfg.heatingvoltage);
+                else
+                    Control_Voltage_To_Blower(BlowerCfg.voltage-500);
+            }
             Control_Dryer_Fan(STOP,75);//use START or STOP,  0 - 100%
             LoadStages++;
             ThreadLoadStateMachine(LoadStages);
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 9698f1ea3..41ef9e480 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -657,7 +657,7 @@ void ScrewTimerInterrupt(int ARG0)
         TimerDisable(Screw_timerBase, TIMER_A);
     }
     ROM_IntMasterEnable();
-    //Report("ScrewsStartControlTimer direction,speed ", __FILE__,__LINE__,ScrewCurrentDirection, RpMessage, ScrewSpeed, 0);
+    //Report("ScrewsStartControlTimer time direction,speed ", __FILE__,msec_millisecondCounter,ScrewCurrentDirection, RpMessage, ScrewSpeed, 0);
     //MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed);
     //Rotations+=0.03;