version 1.4.6.21 before protobuf reduction - pre test. fix small bud in feeder length, big bug in gradients (control task stack size

5 files changed, 9 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 8b7580830..6ba96b079 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,6,20};
+TangoVersion_t _gTangoVersion = {1,4,6,21};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
  char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
index 346eb65f6..e02782c2a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
@@ -379,7 +379,7 @@ uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer)
             LOG_ERROR(request->dispenserid,"my_malloc failed");
         }
     }
-    if ((request->burnrequest == false) && (status = OK))
+    if ((request->burnrequest == false) && (status == OK))
     {
         Cresponse.dispensereeprom = DispenserEEpromInstance;
     }
diff --git a/Software/Embedded_SW/Embedded/Embedded.cfg b/Software/Embedded_SW/Embedded/Embedded.cfg
index 016bacc9c..fe3d71979 100644
--- a/Software/Embedded_SW/Embedded/Embedded.cfg
+++ b/Software/Embedded_SW/Embedded/Embedded.cfg
@@ -105,7 +105,7 @@ Program.global.millisec = Task.create("&MillisecTask", MillisecTaskParams);
 
 var ControlTaskParams = new Task.Params();
 ControlTaskParams.instance.name = "control";
-ControlTaskParams.stackSize = 2048;
+ControlTaskParams.stackSize = 4096;
 ControlTaskParams.priority = 13;
 Program.global.control = Task.create("&controlTask", ControlTaskParams);
 
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;