small improbvements in job handling and job end. preparations for log distributors setup

5 files changed, 41 insertions, 41 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 3826168ec..c936d842c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -67,30 +67,30 @@ int DiagnosticCollectionLimit = 2;  //number of data samples to collect before s
 int DiagnosticLimit =eHundredMillisecond; //frequency of data collection
 int DiagnosticFastLimit = eTenMillisecond; //frequency of data collection
 
-//DigitalPin DigitalPinArray[1][DIAGNOSTICS_LIMIT];
-double dancer1angle[DIAGNOSTICS_LIMIT];
-double dancer2angle[DIAGNOSTICS_LIMIT];
-double dancer3angle[DIAGNOSTICS_LIMIT];
+//DigitalPin DigitalPinArray[1][DIAGNOSTICS_LIMIT+1];
+double dancer1angle[DIAGNOSTICS_LIMIT+1];
+double dancer2angle[DIAGNOSTICS_LIMIT+1];
+double dancer3angle[DIAGNOSTICS_LIMIT+1];
 
-double feedermotorfrequency[DIAGNOSTICS_LIMIT];
-double dryermotor[DIAGNOSTICS_LIMIT];
-double pollermotor[DIAGNOSTICS_LIMIT];
-double windermotor[DIAGNOSTICS_LIMIT];
-double screwmotor[DIAGNOSTICS_LIMIT];
-double mixertemperature[DIAGNOSTICS_LIMIT];
-double headzone1temperature[DIAGNOSTICS_LIMIT];
-double headzone2temperature[DIAGNOSTICS_LIMIT];
-double headzone3temperature[DIAGNOSTICS_LIMIT];
-double headzone4temperature[DIAGNOSTICS_LIMIT];
-double headzone5temperature[DIAGNOSTICS_LIMIT];
-double headzone6temperature[DIAGNOSTICS_LIMIT];
-double dryerzone1temperature[DIAGNOSTICS_LIMIT];
-double dryerzone2temperature[DIAGNOSTICS_LIMIT];
-double dryerzone3temperature[DIAGNOSTICS_LIMIT];
+double feedermotorfrequency[DIAGNOSTICS_LIMIT+1];
+double dryermotor[DIAGNOSTICS_LIMIT+1];
+double pollermotor[DIAGNOSTICS_LIMIT+1];
+double windermotor[DIAGNOSTICS_LIMIT+1];
+double screwmotor[DIAGNOSTICS_LIMIT+1];
+double mixertemperature[DIAGNOSTICS_LIMIT+1];
+double headzone1temperature[DIAGNOSTICS_LIMIT+1];
+double headzone2temperature[DIAGNOSTICS_LIMIT+1];
+double headzone3temperature[DIAGNOSTICS_LIMIT+1];
+double headzone4temperature[DIAGNOSTICS_LIMIT+1];
+double headzone5temperature[DIAGNOSTICS_LIMIT+1];
+double headzone6temperature[DIAGNOSTICS_LIMIT+1];
+double dryerzone1temperature[DIAGNOSTICS_LIMIT+1];
+double dryerzone2temperature[DIAGNOSTICS_LIMIT+1];
+double dryerzone3temperature[DIAGNOSTICS_LIMIT+1];
 
 
-double dispensermotorfrequency[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT];
-double dispenserspressure[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT];
+double dispensermotorfrequency[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT+1];
+double dispenserspressure[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT+1];
 double MidTankpressure[MAX_SYSTEM_DISPENSERS][1];
 double HeatersCurrent[NUM_OF_CURRENT_HEATERS][1];
 
@@ -101,14 +101,14 @@ HeaterState **heatersstates;
 HeaterState  HeaterInfo[HEATER_TYPE__MixerHeater+1];
 DigitalInterfaceState **digitalinterfacestates;
 DigitalInterfaceState DigitalOutputState[MAX_HEATERS_NUM+2];
-/*double dispenser1motorfrequency[DIAGNOSTICS_LIMIT];
-double dispenser2motorfrequency[DIAGNOSTICS_LIMIT];
-double dispenser3motorfrequency[DIAGNOSTICS_LIMIT];
-double dispenser4motorfrequency[DIAGNOSTICS_LIMIT];
-double dispenser5motorfrequency[DIAGNOSTICS_LIMIT];
-double dispenser6motorfrequency[DIAGNOSTICS_LIMIT];
-double dispenser7motorfrequency[DIAGNOSTICS_LIMIT];
-double dispenser8motorfrequency[DIAGNOSTICS_LIMIT];
+/*double dispenser1motorfrequency[DIAGNOSTICS_LIMIT+1];
+double dispenser2motorfrequency[DIAGNOSTICS_LIMIT+1];
+double dispenser3motorfrequency[DIAGNOSTICS_LIMIT+1];
+double dispenser4motorfrequency[DIAGNOSTICS_LIMIT+1];
+double dispenser5motorfrequency[DIAGNOSTICS_LIMIT+1];
+double dispenser6motorfrequency[DIAGNOSTICS_LIMIT+1];
+double dispenser7motorfrequency[DIAGNOSTICS_LIMIT+1];
+double dispenser8motorfrequency[DIAGNOSTICS_LIMIT+1];
 */
 Task_Handle Diagnostics_Task_Handle;
 Mailbox_Handle          DiagnosticsMsgQ = NULL;
@@ -183,15 +183,15 @@ void  SetDiagnosticCollectionLimit(int limit)
 }
 
 uint8_t HeaterCounterIndex[MAX_HEATERS_NUM]= {0,0,0,0,0,0,0,0,0,0};
-double HeaterTemperature[MAX_HEATERS_NUM][DIAGNOSTICS_LIMIT];
+double HeaterTemperature[MAX_HEATERS_NUM][DIAGNOSTICS_LIMIT+1];
 uint8_t  DancerCounterIndex[NUM_OF_DANCERS]= {0,0,0};
-double DancerValue[NUM_OF_DANCERS][DIAGNOSTICS_DANCER_LIMIT];
+double DancerValue[NUM_OF_DANCERS][DIAGNOSTICS_DANCER_LIMIT+1];
 int8_t  DancerErrorCounterIndex[NUM_OF_DANCERS]= {0,0,0};
-double DancerErrorValue[NUM_OF_DANCERS][DIAGNOSTICS_DANCER_LIMIT];
+double DancerErrorValue[NUM_OF_DANCERS][DIAGNOSTICS_DANCER_LIMIT+1];
 uint8_t  MotorCounterIndex[MAX_THREAD_MOTORS_NUM]= {0,0,0};
-double MotorValue[MAX_THREAD_MOTORS_NUM][DIAGNOSTICS_LIMIT];
+double MotorValue[MAX_THREAD_MOTORS_NUM][DIAGNOSTICS_LIMIT+1];
 uint8_t  SpeedCounterIndex= 0;
-double SpeedValue[DIAGNOSTICS_DANCER_LIMIT];
+double SpeedValue[DIAGNOSTICS_DANCER_LIMIT+1];
 
 void DiagnosticLoadMotor(int MotorId, int frequency)
 {
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index bacbe3bfb..74f8c8746 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -58,7 +58,7 @@ uint32_t HWConfigurationInit(void)
     uint8_t* buffer = NULL;
     uint32_t Bytes = 0,i,j,k=0;
     uint32_t status = OK;
-    UploadHardwareConfigurationRequest* UploadRequest;
+    UploadHardwareConfigurationRequest* UploadRequest=0;
 
     GeneralHwReady = false;
     Control_WD(ENABLE,250);
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index b9120ddef..8fe9e5c2e 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -433,7 +433,7 @@ void PrepareACHeater(int HeaterId,uint32_t Frequency, uint32_t SetTemperatue)
         ControlIdtoHeaterId [HeaterId] = AddControlCallback( HeaterControlCBFunction, Frequency/*eOneSecond*/,TemperatureSensorRead,(IfTypeHeaters*0x100+HeaterId),DryerInternalPT100Id,0);
         //HeaterPreviousRead[HeaterId] = TemperatureSensorRead(DryerInternalPT100Id);
         HeaterPreviousRead[HeaterId] = GetFilteredHeaterRead(HeaterId);//
-        Report("PrepareHeater AC Read", __FILE__,HeaterId, SetTemperatue, RpWarning,HeaterPreviousRead[HeaterId], 0);
+        //Report("PrepareHeater AC Read", __FILE__,HeaterId, SetTemperatue, RpWarning,HeaterPreviousRead[HeaterId], 0);
         HeaterPreviousRead[HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain] =  GetFilteredHeaterRead(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain);//TemperatureSensorRead(HeaterId2PT100Id[HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain]);
         HeaterPreviousRead[HARDWARE_PID_CONTROL_TYPE__DryerHeaterSecondary]  = GetFilteredHeaterRead(HARDWARE_PID_CONTROL_TYPE__DryerHeaterSecondary);// = TemperatureSensorRead(HeaterId2PT100Id[HARDWARE_PID_CONTROL_TYPE__DryerHeaterSecondary]);
     }
@@ -497,7 +497,7 @@ int PrepareDCHeater(int HeaterId, uint32_t Frequency, uint32_t SetTemperatue)
         LOG_ERROR (HeaterId,"PT100 not working properly");
         return ERROR;
     }
-    Report("PrepareHeater Read", __FILE__,HeaterId, SetTemperatue, RpWarning,HeaterPreviousRead[HeaterId], 0);
+    //Report("PrepareHeater Read", __FILE__,HeaterId, SetTemperatue, RpWarning,HeaterPreviousRead[HeaterId], 0);
     if (ControlIdtoMaxHeaterId [HeaterId] == 0xFF)
         ControlIdtoMaxHeaterId [HeaterId] = AddControlCallback( DcHeaterMaxTempCBFunction, eOneSecond,TemperatureSensorRead,(IfTypeHeaters*0x100+HeaterId),HeaterId2PT100Id[HeaterId],0);
 
@@ -658,11 +658,11 @@ uint32_t HeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t eadValue)
         {
             if (HeaterMaxTempFlag[index] == true)
             {
-                ActivateHeater(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain);
+               /* ActivateHeater(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain);
                 if (HeaterReady[HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature]==false)
                 {
                     ActivateHeater(HARDWARE_PID_CONTROL_TYPE__DryerHeaterSecondary);
-                }
+                }*/
        //         LOG_ERROR ((MinreadValue/100), "Heater Cooled Off max temperature, turned on");
             }
             HeaterMaxTempFlag[HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain] = false;
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index faee55608..d8564963c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -454,7 +454,7 @@ void ScrewTimerInterrupt(int ARG0)
         TimerDisable(Screw_timerBase, TIMER_A);
     }
     ROM_IntMasterEnable();
-    Rotations+=0.1;
+    Rotations+=0.03;
     /*random++;
     if (random >= 2)
         random = -1;*/
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 4131fbca5..9f5ece15a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -751,7 +751,7 @@ uint32_t ThreadPreSegmentState(void *SegmentDetails, uint32_t SegmentId)
     //wait for all motors to get to the required speed (set the target speed for the control to check)
     //call the job state machine when the thread system is ready
     if ((InitialProcess==false) && (EnableIntersegment == true) && (IntersegmentLength >= 1.0)) //fix - avoid intersegment length 0
-    {
+    {//add initial presegment and cleaning before first segment
         ThreadUpdateProcessLength (IntersegmentLength,(void *)ThreadInterSegmentEnded);
         REPORT_MSG (IntersegmentLength," ThreadPreSegmentState IntersegmentLength");
     }