diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-06 21:22:51 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-06 21:22:51 +0300 |
| commit | 7f6a0eb88514f7f60a66bad3ecc1cb4cae0ed2ea (patch) | |
| tree | 4f5bbb52830922cd2be496024951b132663b5de3 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 5b6d9137b0a4efc2e035656caf3d0a3cba9f4d8b (diff) | |
| download | Tango-7f6a0eb88514f7f60a66bad3ecc1cb4cae0ed2ea.tar.gz Tango-7f6a0eb88514f7f60a66bad3ecc1cb4cae0ed2ea.zip | |
valves mitigatio trial, heaters max temperature handling. IDS pressure building control.loading fixed. bug in winder prepare fixed, RFID tag update in Protobuf
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index d5c186893..6edc5b3f2 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -1109,6 +1109,8 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue) } Report("ThreadLoadButton",__FILE__,__LINE__,LoadStages,RpMessage,ReadValue,0); Report("ThreadLoadButton params",__FILE__,LoadStatus,TryAgain,RpMessage,SecondTry,0); + if (LoadStages == THREAD_LOAD_INITIAL_TENSION) //on this satge we should wait for user call + MessageState = 2; ThreadLoadingReport(); if (LoadStatus == ERROR) { @@ -1407,8 +1409,6 @@ uint32_t ThreadLoadingReport(void) if (ThreadLoadingToken[0] == 0) return OK; - if (LoadStages == THREAD_LOAD_INIT) - return OK; if (MessageState == 0) { diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 2b6492dab..f4d34284d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -273,7 +273,8 @@ uint32_t Winder_PrepareStage2(uint32_t deviceID, uint32_t ReadValue) uint32_t Winder_ScrewAtOffsetCallback(uint32_t MotorId, uint32_t BusyFlag) { //MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,temp_MaxFrequency); - Screw_wait_counter--; + if (Screw_wait_counter) + Screw_wait_counter--; MotorStop (MotorId,Soft_Hiz); //per L6470 errata between mov and run commands /*#ifdef FOUR_WINDERS |