merge

5 files changed, 11 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 4cd56df56..cb1be7fa5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -562,7 +562,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
         temp = Read_Fans_Tacho();
         DrawerFansStatus = temp & 0x1F;
         SystemFansStatus = temp & 0xE0;
-        KeepAliveOneSecondCall();
+        //KeepAliveOneSecondCall();
         for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++)
         {
             if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW)
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index f0edc56ab..781a48692 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -273,6 +273,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
 
     if (JobIsActive())
     {
+        LOG_ERROR(1,"JobIsActive");
         return ERROR;
     }
     if (watchdogCriticalAlarm == true)
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 6bf587980..40591a76d 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -579,7 +579,7 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
          }
      }
 
-     if (NumofReadyDispensers)
+     if ((NumofReadyDispensers)&&(DispenserBuildTimeCounter%10 == 0))
          Report("IDS_Prepare_Callback",__FILE__,DispenserBuildTimeCounter,NumofReadyDispensers,RpWarning,(int)NumOfActiveDispensers,0);
 
      if (NumofReadyDispensers>=NumOfActiveDispensers)
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index c6f2526db..c3b94c01f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -25,6 +25,12 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
 
     ProgressResponse response = PROGRESS_RESPONSE__INIT;
 
+    if((request->amount == 0xDE) && (request->delay < 8) && (request->delay >= 0)) // read dispenser type + LS status
+    {
+        response.progress = ((Dispenser_struct[request->delay].Type) << 8) + Dispenser_struct[request->delay].Status;
+        response.has_progress = true;
+    }
+    else
     if((request->amount == 0xCF) && (request->delay == 0xCF)) //Create File System on the Drive
     {
         FRESULT iFResult = Init_Flash_File_System(true);
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index b29f24f73..06597ee84 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -289,7 +289,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
         WinderReferenceSpeed = Averagewinderspeed;
     }
     screw_horizontal_speed = ScrewNumberOfSteps /  Rotations;//InternalWinderCfg.NumberOfRotationPerPassage;
-    if (Rotations > 7.0)
+    if (Rotations > 6.4)//7.0)
         Rotations = 6.0;
     RotationsPerSecond =  WinderReferenceSpeed / (double)MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_WINDER].pulseperround;
     tempScrewSpeed = screw_horizontal_speed*RotationsPerSecond;
@@ -479,7 +479,7 @@ void ScrewTimerInterrupt(int ARG0)
         TimerDisable(Screw_timerBase, TIMER_A);
     }
     ROM_IntMasterEnable();
-    Rotations+=0.01;
+    Rotations+=0.005;
 
     return ;