version 1.4.5.2 fix problems in brushstop free and in cleaner/lub direction

5 files changed, 16 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
index 49cda79cd..de8e39ee1 100644
--- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
+++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
@@ -20,7 +20,7 @@ typedef struct
 } TangoVersion_t;
 
 
-TangoVersion_t _gTangoVersion = {1,4,5,1};//remove AUTO_HOME_DISPENSERS + midtank pressure  new calculation
+TangoVersion_t _gTangoVersion = {1,4,5,2};//remove AUTO_HOME_DISPENSERS + midtank pressure  new calculation
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
  char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index d62d117a0..b74ba79b3 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -173,8 +173,8 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams)
     HeatersStopControlOnHeatersOff(ProcessParams);
     dyeingspeed = ProcessParams->dyeingspeed;
     dryerbufferlength = ProcessParams->dryerbufferlength;
-    dryerbufferMeters = dryerbufferlength*0.76+0.6;
-    dryerbufferCentimeters = dryerbufferlength*76+60;
+    dryerbufferMeters = dryerbufferlength*0.76+0.9;
+    dryerbufferCentimeters = dryerbufferlength*76+90;
 
     Report("drier buffer length",__FILE__,(int)dryerbufferlength,(int)dryerbufferMeters*100,RpWarning,(int)dryerbufferCentimeters,0);
 
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 043f83b7b..455b017de 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -662,7 +662,7 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
 
     for (Motor_i = 0;Motor_i < MAX_SYSTEM_DISPENSERS;Motor_i++)
     {
-        //HW_Motor_Id = DispenserIdToMotorId[Motor_i];
+        TimerMotors_t  HW_Motor_Id = DispenserIdToMotorId[Motor_i];
         Pid_Id = Motor_i;/*IDSMotorIdToControlId[Motor_i];*/
             DispenserControlConfig[Motor_i].m_params.MAX = 1;
             DispenserControlConfig[Motor_i].m_params.MIN = DispensersControl[Pid_Id].outputproportionalpowerlimit*-1;
@@ -679,7 +679,7 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
             DispenserControlConfig[Motor_i].m_preError = 0;
             DispenserControlConfig[Motor_i].m_SetParam = 0;//need to update SetParams on presegment stage
 
-            //MotorSetDirection((TimerMotors_t)HW_Motor_Id,MotorsCfg[HW_Motor_Id].directionthreadwize); //set the dispenser to the
+            MotorSetDirection((TimerMotors_t)HW_Motor_Id,MotorsCfg[HW_Motor_Id].directionthreadwize); //set the dispenser to the
             /*Start the dispensers to build initial pressure
              * check different handling for dispensers that participate in the first segment and idle dispensers
              * start control for initial pressure
@@ -1141,7 +1141,11 @@ uint32_t IDSPreSegmentState(void *SegmentDetails, int SegmentId)
         PreSegmentReady(Module_IDS,ModuleFail);
         return ERROR;
     }
-
+    if (FileBrushStop)
+    {
+        //REPORT_MSG(FileBrushStop->index,"calling Free BrushStop file Read Index");
+        FreeBrushStopFileData(FileBrushStop);
+    }
     if ((EnableIntersegment == true)&&(IntersegmentLength>0))
     {
         Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Waste); //if intersegment is defined throw the ink away
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 4789c7a17..46ecb1d46 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -332,7 +332,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
          if (WinderRunSamples>10)
          {
              WinderRunSum+=WinderRun;
-             WinderRunAverage = WinderRunSum/(WinderRunSamples-10);
+             WinderRunAverage = WinderRunSum/(WinderRunSamples);
              if ((fabs(WinderRun-WinderRunAverage)>=30)||(WinderRunSamples%100 == 0))
              {
                  usnprintf(ScrewStr, 150, "curr,sum,avg,samples {Winder Encoder:, %d, %d, %d, %d, %d}",WinderRun,(int)WinderRunSum,(int)WinderRunAverage,(int)WinderRunSamples,
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
index 7df894194..710876e4a 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
@@ -207,12 +207,17 @@ JobDescriptionFileSegment *GetNextSegmentFromJobFile()
         LOG_ERROR (Fresult, "f_read error");
         //status = ERROR;
     }
+    //if (Segment)
+    //    REPORT_MSG(Segment->brushstopscount,"GetNextSegmentFromJobFile file Read Index");
     return Segment;
 }
 void FreeSegmentFileData(JobDescriptionFileSegment *Segment)
 {
     if (Segment)
+    {
+        //REPORT_MSG(Segment->brushstopscount,"FreeSegmentFileData file Read Index");
         job_description_file_segment__free_unpacked(Segment,NULL);
+    }
     else
         LOG_ERROR (readbBytes, "Null segment free called");
     Segment = NULL;