diff options
| author | Mirta <mirta@twine-s.com> | 2020-08-19 10:33:15 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2020-08-19 10:33:15 +0300 |
| commit | e3bc7c2268cb25464d62dd56c7c265826c57d3c0 (patch) | |
| tree | 59ff75312959109f826bf70f2e7e82e689bba1fd /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 7b6a64613bc18b1ce6c92fa9c335684ebaf00c90 (diff) | |
| parent | 4702a085323fc2a6b403187867f9bf8c66bf45f6 (diff) | |
| download | Tango-e3bc7c2268cb25464d62dd56c7c265826c57d3c0.tar.gz Tango-e3bc7c2268cb25464d62dd56c7c265826c57d3c0.zip | |
resolved conflicts
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 151886016..931400aaa 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -208,7 +208,7 @@ { if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD) { - WHS_Set_SetPoint_Q_value(headairflow*2/3); + WHS_Set_SetPoint_Q_value(headairflow); } else { @@ -366,8 +366,8 @@ if (Head_Type == HEAD_TYPE_FLAT) { Report("Thread_Load_Lift_actuators",__FILE__,__LINE__,LOW,RpMessage,false,0); - Trigger_Head_Actuators_Control(ACT_IN_AND_OUT, LOW,true); - //Trigger_Head_Actuators_Control(ACTIN, LOW,true); + Trigger_Head_Actuators_Stub(ACTOT, ENABLE, UP); + Trigger_Head_Actuators_Stub(ACTIN, ENABLE, UP); } return OK; } @@ -500,8 +500,8 @@ if (Head_Type == HEAD_TYPE_FLAT) { Report("Thread_Load_Close_actuators",__FILE__,__LINE__,LOW,RpMessage,true,0); - Trigger_Head_Actuators_Control(ACTOT, LOW,false); - //Trigger_Head_Actuators_Control(ACTIN, LOW,false); + Trigger_Head_Actuators_Stub(ACTOT, ENABLE, DOWN); + //Trigger_Head_Actuators_Stub(ACTIN, ENABLE, DOWN); HeadCard_Actuators_Relocate(); } if (Head_Type != HEAD_TYPE_ARC) @@ -1469,7 +1469,7 @@ uint32_t ThreadLoadingReport(void) uint32_t TryThreadLoadingFunc(MessageContainer* requestContainer) { - TryThreadLoadingRequest *request = continue_thread_loading_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); + TryThreadLoadingRequest *request = try_thread_loading_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); TryThreadLoadingResponse Cresponse = TRY_THREAD_LOADING_RESPONSE__INIT; MessageContainer responseContainer; MessageState = 2; |