diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-12-19 11:48:39 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-12-19 11:48:39 +0200 |
| commit | 8c8e40e01349bf8f2c42a7fae086ed83b9c3d37a (patch) | |
| tree | 4e057467a2d25ccf0089fdf56826623fb824f034 /Software/Embedded_SW/Embedded/Modules/Thread/Thread.h | |
| parent | 886a476b862f573be5b38036edfe9582946ebe1d (diff) | |
| parent | a61a911d1ebde107ba7bf210af7e753e692d93e2 (diff) | |
| download | Tango-8c8e40e01349bf8f2c42a7fae086ed83b9c3d37a.tar.gz Tango-8c8e40e01349bf8f2c42a7fae086ed83b9c3d37a.zip | |
merge conflict take remot
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread.h')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h index 56fb79c23..d1d23598f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h @@ -82,6 +82,7 @@ void SetKeepWindingCone(bool value); void SetWinderBackToBaseTime(uint32_t value); uint32_t DancerConfigMessage(HardwareDancer * request); +uint32_t Control_Delta_Position_Pass(uint32_t Current_Read,uint32_t Previous_Read); void SetOriginMotorSpeed(float process_speed); |