diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-06-18 14:07:59 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-06-18 14:07:59 +0300 |
| commit | 247899ef27f6dec54f49876cb66c5749aa8d27fb (patch) | |
| tree | 346d89738e3ee134679f8b9340b37cdeddb867bf /Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h | |
| parent | 1fd773deb7bba088c5f1c13a1b9ccab85f927ddc (diff) | |
| parent | 3640afb74b3e7b3e232f56a14104866690495c9a (diff) | |
| download | Tango-247899ef27f6dec54f49876cb66c5749aa8d27fb.tar.gz Tango-247899ef27f6dec54f49876cb66c5749aa8d27fb.zip | |
conflict merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h index ea75bffa3..b7401c77f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h @@ -2,6 +2,8 @@ #ifndef MODULES_THREAD_THREAD_EX_H_ #define MODULES_THREAD_THREAD_EX_H_ +#include "PMR/Printing/JobSpool.pb-c.h" + //typedef enum //{ #define WINDER_DANCER HARDWARE_DANCER_TYPE__LeftDancer @@ -10,6 +12,8 @@ #define NUM_OF_DANCERS HARDWARE_DANCER_TYPE__RightDancer+1 //} DANCER_ENUM; +uint32_t InternalWindingConfigMessage(JobSpool* request); + uint32_t ThreadPrepareState(void *JobDetails); uint32_t ThreadPreSegmentState(void *JobDetails); uint32_t ThreadSegmentState(void *JobDetails, int SegmentId); |