diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-04-21 15:58:33 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-04-21 15:58:33 +0300 |
| commit | bd2e83f3d46414d756f59c2f70cc561718a3022e (patch) | |
| tree | a9b3973ca59f5f96569b8878ec9d8ed0ecbb563b /Software/Embedded_SW/Embedded/Modules | |
| parent | 5677c3d08e15bef1d6629de42b6c2749f4efcef0 (diff) | |
| download | Tango-bd2e83f3d46414d756f59c2f70cc561718a3022e.tar.gz Tango-bd2e83f3d46414d756f59c2f70cc561718a3022e.zip | |
version 1.4.6.21 before protobuf reduction - pre test. fix small bud in feeder length, big bug in gradients (control task stack size
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 6 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index 213774270..5be960d0f 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -1471,7 +1471,7 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue) JobDispenser **Dispensers = NULL; int n_dispensers = 0; JobSegment* Segment = (void *)IfIndex; - + Task_Stat statbuf; if(BrushStopCounter++ < BrushStopTime) { return OK; @@ -1497,7 +1497,9 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue) FileBrushStop = GetNextBrushStopFromJobFile(); if (FileBrushStop) { - REPORT_MSG(FileBrushStop->index,"BrushStopRead Index"); + Task_stat(Control_Task_Handle,&statbuf); + //REPORT_MSG(FileBrushStop->index,"BrushStopRead Index"); + Report("BrushStopRead Index",__FILE__,__LINE__,(int)FileBrushStop->index,RpWarning,(int)statbuf.used,0); Dispensers = FileBrushStop->dispensers; n_dispensers = FileBrushStop->n_dispensers; } diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index a6a8314ab..3187e2568 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -184,9 +184,9 @@ uint32_t ThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue) } prevprev = PreviousPosition; if (Extended_Motor_Param[ThreadMotorIdToMotorId[index]] == true) //powerstep driver reverses the direction - positionDiff = Control_Delta_Position_Pass(PoolerPreviousPosition,PoolerCurrentPosition); + positionDiff = Control_Delta_Position_Pass(PreviousPosition,CurrentPosition); else - positionDiff = Control_Delta_Position_Pass(PoolerCurrentPosition,PoolerPreviousPosition); + positionDiff = Control_Delta_Position_Pass(CurrentPosition,PreviousPosition); //positionDiff = positionDiff / MotorsCfg[ThreadMotorIdToMotorId[index]].microstep; PreviousPosition = CurrentPosition; |