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

2 files changed, 8 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index c3f15aff8..8a3b20e57 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -1132,9 +1132,13 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue)
             SecondTry = false;
             Report("Calling State machine  2nd try",__FILE__,LoadStages,LoadStatus,RpMessage,SecondTry,0);
             load.color = BLINK;
-            //if (LoadStages > THREAD_LOAD_INITIAL_TENSION)
-            //    ThreadLoadingRestartReport();
-            ThreadLoadStateMachine(LoadStages+1);
+            if (LoadStages == THREAD_LOAD_LIFT_DANCERS)
+            {
+                LoadStages++;
+                LoadStatus = OK;
+            }
+            else
+                ThreadLoadStateMachine(LoadStages+1);
         }
         else //((SecondTry == false)&&(TryAgain == false))???????
         {
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 011488c49..a75241671 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -113,7 +113,7 @@ uint32_t InternalWindingConfigMessage(JobSpool* request)
         Report("limit switch start point offset",__FILE__,__LINE__,(int)(request->startoffsetpulses),RpWarning,(int)(request->limitswitchstartpointoffset), 0);
     }
     status |= MCU_E2PromRead(EEPROM_STORAGE_WINDER_CALIBRATION,&limitswitchstartpointoffset);
-    if ((status!= OK )||(limitswitchstartpointoffset == 0xFFFF))
+    if ((status!= OK )||(limitswitchstartpointoffset >= 200))
         limitswitchstartpointoffset = 0;
     Report("limit switch start point offset",__FILE__,(int)(request->startoffsetpulses),(int)(limitswitchstartpointoffset),RpWarning,status, 0);
     InternalWinderCfg.startoffsetpulses += limitswitchstartpointoffset;