diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-04-17 09:21:13 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-04-17 09:21:13 +0300 |
| commit | a5ec5d754dd516dfadbb34fe1b167eff817ded6e (patch) | |
| tree | 3211ac7b38c7cee056fe71c17c258fed741b342a /Software/Embedded_SW/Embedded/Modules/General | |
| parent | e66cd269ad02302f2a5a4ec377112cd61789647e (diff) | |
| parent | 26871cba2047dfc7afa6922a34e4f6b7bc9d4932 (diff) | |
| download | Tango-a5ec5d754dd516dfadbb34fe1b167eff817ded6e.tar.gz Tango-a5ec5d754dd516dfadbb34fe1b167eff817ded6e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
3 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index b7f926da6..1ccfd3df8 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -3,13 +3,13 @@ * Control module * ************************************************************************************************************************/ +#include <DataDef.h> #include "include.h" #include "GeneralHardware.h" #include "thread/thread.h" #include "ids/ids.h" #include "control/control.h" #include "heaters/heaters_ex.h" -#include <Modules/Stubs_Handler/DataDef.h> #include "PMR/common/MessageContainer.pb-c.h" #include "Modules/Stubs_Handler/Container.h" #include "PMR/Hardware/UploadHardWareConfigurationRequest.pb-c.h" diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h index d0bcca682..8deaf7586 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h @@ -1,8 +1,8 @@ #ifndef GENERALHARDWARE_H #define GENERALHARDWARE_H +#include "../../DataDef.h" #include "include.h" -#include <Modules/Stubs_Handler/DataDef.h> #include "PMR/common/MessageContainer.pb-c.h" #include "Modules/Stubs_Handler/Container.h" diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c index dfc00834e..763348254 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/process.c +++ b/Software/Embedded_SW/Embedded/Modules/General/process.c @@ -5,10 +5,10 @@ * Author: shlomo */ //******************************************************************************************************************** +#include <DataDef.h> #include "include.h" #include "process.h" -#include <Modules/Stubs_Handler/DataDef.h> #include "heaters/heaters_ex.h" #include "PMR/Printing/ProcessParameters.pb-c.h" #include "PMR/Printing/UploadProcessParametersRequest.pb-c.h" |