diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-07-21 13:51:31 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-07-21 13:51:31 +0300 |
| commit | 74dbbc5c487559d59c71ee03621b736570585478 (patch) | |
| tree | bab2e20bed2fe11358fd2375c9af042cabc106a4 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | bf181a74e502c84a74c13a6027ca382daada4320 (diff) | |
| download | Tango-74dbbc5c487559d59c71ee03621b736570585478.tar.gz Tango-74dbbc5c487559d59c71ee03621b736570585478.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 92b953db5..420141d5b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -89,14 +89,14 @@ void SetWinderBackToBaseTime(uint32_t value) ReportWithPackageFilter(ThreadFilter,"Set WinderBackToBaseTime",__FILE__,__LINE__,WinderBackToBaseTime,RpWarning,KeepWindingCone, 0); } -uint32_t InternalWinderConfigMessage(HardwareWinder* request) +/*uint32_t InternalWinderConfigMessage(HardwareWinder* request) { uint32_t status = PASSED; InternalWinderCfg.milimetersperrotation = request->millimeterperrotation; return status; -} +}*/ char ScrewStr[150]; uint32_t InternalWindingConfigMessage(JobSpool* request) diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 1c52a9b68..c67619e20 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -963,7 +963,7 @@ uint32_t ThreadPrepare_Tension (int DancerId, double tension) } usnprintf(Lenstr, 100, "ThreadPrepare_Tension Dancer %d Request: %d Current %d movement %d dir %d motor %d address %d", DancerId,request,current,movement,direction,HW_Motor_Id,address); - ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,address,HARDWARE_MOTOR_TYPE__MOTO_DH_LID,RpWarning,PrepareWaitCount,0); + ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,address,current,RpWarning,request,0); return status; } |
