Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 7 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index eafe9e5a0..22fcf3e6f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -174,6 +174,7 @@ InternalWinderCfg.segmentoffsetpulses
   
 numOfSteps = InternalWinderCfg.startoffsetpulses*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].microstep;
 */
+char ScrewStr[100];
 uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
 {
     uint32_t Steps,i,winderspeed=0;
@@ -233,8 +234,12 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
     temp /= ScrewSpeed;
     if (ScrewRunningTime != temp)
     {
+        usnprintf(ScrewStr, 254, "Winder: Steps,Speed, Time, WinderSpeed{ %d, %d ,%d, %d} ",ScrewNumberOfSteps,ScrewSpeed,temp,WinderReferenceSpeed);
+        //        Report(logmsg[index],__FILE__,__LINE__,index,RpWarning,index,  Counter[index]);
+        //        #warning PID is now only proportional (above)
+        Report(ScrewStr,__FILE__,__LINE__,ScrewCurrentDirection,RpWarning,CalculationDirectionChangeCounter, 0);
         //LOG_ERROR(temp , "new winder speed");
-        Report("new winder speed",__FILE__,__LINE__,temp,RpWarning,ScrewSpeed,0);
+        //Report("new winder speed",__FILE__,__LINE__,temp,RpWarning,ScrewSpeed,0);
     }
     ScrewRunningTime = temp;//(SYS_CLK_FREQ*Steps)/ScrewSpeed;
 
@@ -304,7 +309,7 @@ uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId)
         ScrewControlId = AddControlCallback(Screw100msecDirectionChange, eHundredMillisecond,TemplateDataReadCBFunction,0,0,0);
         ScrewDirectionChangeCounter = 1;
         CalculationDirectionChangeCounter = 1;
-        memset (WinderMotorSpeed,0,sizeof(uint32_t) *MAX_WINDER_SPEED_CALCULATION);
+        memset (WinderMotorSpeed,0,sizeof(WinderMotorSpeed) );
         WinderMotorSpeedCounter=0;
         WinderMotorSpeedRollOver=false;
    }