Version 1.3.10.2: another way to test the dispenser type

3 files changed, 10 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 800d40db6..ad7f8a92d 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -289,8 +289,6 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
     if (request->n_winders == 1)
         status += InternalWinderConfigMessage(request->winders);
 
-    Check_Dispenser_Type();
-    Init_Dispensers_IO_Registers(&Disp_IO_Reg);
 
     status += MotorsInit();
  
@@ -344,7 +342,14 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
     if (request->n_dispensers <= MAX_SYSTEM_DISPENSERS)
     {
         for (Dispenser_i = 0; Dispenser_i < request->n_dispensers ; Dispenser_i++)
+        {
             status += DispenserConfigMessage(request->dispensers[Dispenser_i]);
+            if (Check_Dispenser_Type(Dispenser_i) == LS_STATUS_ERROR)
+            {
+                LOG_ERROR (Dispenser_i, "Dispenser identification failed");
+                //return ERROR;
+            }
+        }
     }
     else
     {
@@ -352,6 +357,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
         upload_hardware_configuration_request__free_unpacked(UploadRequest,NULL);
         return ERROR;
     }
+    Init_Dispensers_IO_Registers(&Disp_IO_Reg);
     if (request->n_breaksensors == 1)
     {
         ThreadConfigBreakSensor(request->breaksensors[0]);
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index f8b0efb17..f1c8956ff 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -481,7 +481,7 @@ void ScrewTimerInterrupt(int ARG0)
         TimerDisable(Screw_timerBase, TIMER_A);
     }
     ROM_IntMasterEnable();
-    Rotations+=0.01;
+    Rotations+=0.03;
 
     return ;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index c292f7dcd..ad8f497db 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -503,7 +503,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         }
         if ((JobCounter % 1000) == 0)
         {
-            if (JobCounter >= 20000)
+            if (JobCounter >= 5000)
             {
                 MotorSpeedSamples[index][MotorSpeedSamplePointer[index]] = CurrentControlledSpeed[index];//(-1 * TranslatedReadValue);
                 MotorSpeedSamplePointer[index]++;