diff options
| author | Mirta <mirta@twine-s.com> | 2020-08-13 14:10:37 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2020-08-13 14:10:37 +0300 |
| commit | 70ada335b3136cd2d97d277b03b5148efb76fc23 (patch) | |
| tree | ecdb3761a96c064086138b81e9f0be629f916706 /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 83a2fe023aae54f7a296aec76e0ad2e24d2d33f5 (diff) | |
| parent | ccb92223657ac5a21af5aa21d309d9924d9a0fd8 (diff) | |
| download | Tango-70ada335b3136cd2d97d277b03b5148efb76fc23.tar.gz Tango-70ada335b3136cd2d97d277b03b5148efb76fc23.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
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, 9 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index c7ec8a58c..151886016 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -1344,10 +1344,16 @@ void ThreadLoadRequest(MessageContainer* requestContainer) responseContainer = createContainer(MESSAGE_TYPE__StubHeatingTestResponse, requestContainer->token, false, &response, &stub_heating_test_response__pack, &stub_heating_test_response__get_packed_size); container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); - int LoadStage = (int)request->dryerzone1temp; - LoadStages = LoadStage; - ThreadLoadStateMachine(LoadStage); + if (request->hardwarepidcontrol1!=NULL) + { + UpdatePidDuringRun(request->hardwarepidcontrol1); + } + else + { + LoadStages = LoadStage; + ThreadLoadStateMachine(LoadStage); + } /*if (status) { |