diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-03 12:29:57 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-03 12:29:57 +0200 |
| commit | 64acdf2b43affc3403d6d40c96a6d48cfc5c5e23 (patch) | |
| tree | 735ac691a4f055dc984e5e477ef49f60f4e71e2a /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | af782aca2364948527c1107a02428897fb8382a1 (diff) | |
| parent | 907aa0cd6c29c182d4647f8d2dab89750fd23bc9 (diff) | |
| download | Tango-64acdf2b43affc3403d6d40c96a6d48cfc5c5e23.tar.gz Tango-64acdf2b43affc3403d6d40c96a6d48cfc5c5e23.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index ffbb504db..f327ef3b2 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -247,8 +247,7 @@ } uint32_t Thread_Load_Set_Load_Arm_To_Stopper_Callback(uint32_t deviceID, uint32_t BusyFlag) { - uint32_t temp = Read_Dryer_ENC_Position(); - int angle; + uint32_t angle, temp = Read_Dryer_ENC_Position(); ReportWithPackageFilter(DiagnosticsFilter,"Thread_Load_Set_Load_Arm_To_Stopper_Callback",__FILE__,(int)numberOfCycles,(int)DrierPrevLocation,RpMessage,temp,0); @@ -259,7 +258,7 @@ { CallbackCounter--; } - if (abs(angle)<10 ) // OK + if ((abs(angle)<200 )&&(BusyFlag == NOTBUSY)) // OK { Report("Thread_Load_Set_Load_Arm_To_Stopper time",__FILE__,msec_millisecondCounter - UnloadingStart,msec_millisecondCounter,RpMessage,UnloadingStart,0); @@ -275,7 +274,7 @@ else { load.color = fastBILNK; - usnprintf(LoadErrorMsg, 100, "^Stage %s - %s timeout",LoadStagesStr[LoadStages], MotorStr[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LOADARM]); + usnprintf(LoadErrorMsg, 100, "*Stage %s - %s timeout",LoadStagesStr[LoadStages], MotorStr[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LOADARM]); Report(LoadErrorMsg,__FILE__,__LINE__,LoadStages,RpWarning,TimeoutsCounter,0); LoadStatus = ERROR; @@ -1532,12 +1531,6 @@ uint32_t TryThreadLoadingFunc(MessageContainer* requestContainer) { responseContainer = createContainer(MESSAGE_TYPE__TryThreadLoadingResponse, requestContainer->token, true, &Cresponse, &try_thread_loading_response__pack, &try_thread_loading_response__get_packed_size); responseContainer.continuous = false; - if (JobIsActive()||(MachineReadyForHeating == false)||(FPGABurningActive==true)) - { - responseContainer.has_error = true; - responseContainer.error = ERROR_CODE__GENERAL_ERROR; - responseContainer.errormessage = "The machine is not ready for loading"; - } uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); |