diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-21 09:17:46 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-21 09:17:46 +0300 |
| commit | 193f7f5e096751da747b0fe9d145bd43a02d7340 (patch) | |
| tree | ce0aa138252ca76426fbbc84e1753d7e410011a9 /Software/Embedded_SW/Embedded/Modules/Thread/Thread.h | |
| parent | 98493042a5dace2535dd4343c047eaf1bd784ae3 (diff) | |
| parent | f468145c16b5c677201327feeb4f207c21df0b0b (diff) | |
| download | Tango-193f7f5e096751da747b0fe9d145bd43a02d7340.tar.gz Tango-193f7f5e096751da747b0fe9d145bd43a02d7340.zip | |
merge after conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread.h')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h index 2aa0b220a..a725468e9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h @@ -13,7 +13,6 @@ #include "PMR/Printing/JobSpoolType.pb-c.h" #include "drivers/Motors/Motor.h" -#include "drivers/SSI_Comm/ssi_comm.h" #include "thread_ex.h" @@ -39,7 +38,7 @@ extern HardwarePidControlType ThreadMotorIdToControlId[MAX_THREAD_MOTORS_NUM]; extern bool BreakSensorenabled; extern int32_t BreakSensordebouncetimemilli; -extern HardwareMotor MotorsCfg[NUM_OF_MOTORS]; +//extern MotorDriverConfigStruc MotorsCfg[NUM_OF_MOTORS]; extern HardwarePidControl MotorsControl[MAX_THREAD_MOTORS_NUM]; //extern InternalWinderConfigStruc InternalWinderCfg; extern HardwareDancer DancersCfg[MAX_SYSTEM_DANCERS]; |