fix FF reports, add time support for error log (and world time in the system), report regarding dispensers 50% and 25% LS

4 files changed, 59 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 9d784112e..fd13e37e5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -22,6 +22,10 @@
 
 #include "MillisecTask.h"
 #include <driverlib/timer.h>
+#include <time.h>
+#include "Common/Utilities/Utils.h"
+#include "driverlib/hibernate.h"
+
 #include <Drivers/SSI_Comm/SSI_Comm.h>
 #include <Drivers/SSI_Comm/Speed_Sensor/Speed_Sensor.h>
 #include <Drivers/SSI_Comm/Dancer/Dancer.h>
@@ -741,6 +745,11 @@ uint32_t MillisecLowLoop(uint32_t tick)
         DispensersCollectionCall();
     if (O200Millisecond_Tick)
     {
+
+        ulocaltime(umktime(&LocalTime)+1,&LocalTime);
+        HibernateCalendarSet(&LocalTime);
+        ReportWithPackageFilter(ThreadFilter,"Time: ",__FILE__,LocalTime.tm_hour,LocalTime.tm_min,RpWarning,(int) LocalTime.tm_sec,0);
+
         Trigger_WHS_MAX11614_Read_allADC();
         FPGA_GetAllDispensersValveBusyOCD();
         Read_Dryer_Fan_Tacho();
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
index 4ee94dae4..4d103395c 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
@@ -33,6 +33,29 @@ uint32_t OpenValveTimeout = 10;
 #define DISPENSER_BUILD_PRESSURE_TIMEOUT 120000
 #define DISPENSER_BUILD_PRESSURE_LAG 50
 #define DEFAULT_NANOLITER_PER_PULSE 2.34
+
+FPGA_GPI_ENUM     Dispenser_Id_to_LS_50_Id[MAX_SYSTEM_DISPENSERS] = {
+      GPI_LS_DISPENSER_50_1, //MOTO_DISPENSER_1 = 6,
+      GPI_LS_DISPENSER_50_2, //MOTO_DISPENSER_2 = 7,
+      GPI_LS_DISPENSER_50_3, //MOTO_DISPENSER_3 = 8,
+      GPI_LS_DISPENSER_50_4, //MOTO_DISPENSER_4 = 9,
+      GPI_LS_DISPENSER_50_5, //MOTO_DISPENSER_5 = 10,
+      GPI_LS_DISPENSER_50_6, //MOTO_DISPENSER_6 = 11,
+      GPI_LS_DISPENSER_50_7, //MOTO_DISPENSER_7 = 12,
+      GPI_LS_DISPENSER_50_8, //MOTO_DISPENSER_8 = 13,
+};
+FPGA_GPI_ENUM     Dispenser_Id_to_LS_25_Id[MAX_SYSTEM_DISPENSERS] = {
+      GPI_LS_DISPENSER_25_1, //MOTO_DISPENSER_1 = 6,
+      GPI_LS_DISPENSER_25_2, //MOTO_DISPENSER_2 = 7,
+      GPI_LS_DISPENSER_25_3, //MOTO_DISPENSER_3 = 8,
+      GPI_LS_DISPENSER_25_4, //MOTO_DISPENSER_4 = 9,
+      GPI_LS_DISPENSER_25_5, //MOTO_DISPENSER_5 = 10,
+      GPI_LS_DISPENSER_25_6, //MOTO_DISPENSER_6 = 11,
+      GPI_LS_DISPENSER_25_7, //MOTO_DISPENSER_7 = 12,
+      GPI_LS_DISPENSER_25_8, //MOTO_DISPENSER_8 = 13,
+};
+bool DispenserDirectionFlag_50[MAX_SYSTEM_DISPENSERS] = {0,0,0,0,0,0,0,0};
+bool DispenserDirectionFlag_25[MAX_SYSTEM_DISPENSERS] = {0,0,0,0,0,0,0,0};
 uint32_t DispenserPrepareSpeed = DISPENSER_BUILD_PRESSURE_SPEED;
 double   DispenserPreparePressure = DISPENSER_BUILD_PRESSURE_LIMIT;
 uint32_t DispenserPrepareTimeout = DISPENSER_BUILD_PRESSURE_TIMEOUT;
@@ -380,6 +403,16 @@ void IDS_Dispenser_Content_Calculation (char DispenserId)
         {
             ReportWithPackageFilter(IDSFilter,"IDS_Dispenser_Data ",__FILE__,DispenserId,(int)IDS_Dispenser_Data[DispenserId].consumedinnanolitter,RpWarning,(int)CurrentDispenserSpeed[DispenserId],0);
         }
+        if ((Dispenser_Id_to_LS_50_Id[DispenserId])&&(DispenserDirectionFlag_50[DispenserId]==false))
+        {
+            DispenserDirectionFlag_50[DispenserId]= true;
+            ReportWithPackageFilter(IDSFilter,"Dispenser at 50% ",__FILE__,DispenserId,(int)IDS_Dispenser_Data[DispenserId].consumedinnanolitter,RpWarning,(int)65000000,0);
+        }
+        if ((Dispenser_Id_to_LS_25_Id[DispenserId])&&(DispenserDirectionFlag_25[DispenserId]==false))
+        {
+            DispenserDirectionFlag_25[DispenserId]= true;
+            ReportWithPackageFilter(IDSFilter,"Dispenser at 25% ",__FILE__,DispenserId,(int)IDS_Dispenser_Data[DispenserId].consumedinnanolitter,RpWarning,(int)32500000,0);
+        }
     }
     if (DispenserId == 0)
     {
@@ -410,6 +443,8 @@ void IDS_Dispenser_RefillStarted (char DispenserId,char  MicroSteps)
     IDS_Dispenser_Data[DispenserId].nanolitterperpulse = assumedFlow;
     IDS_Dispenser_Data[DispenserId].microsteps = 1;
     IDS_Dispenser_Data[DispenserId].direction = 0;*/
+    DispenserDirectionFlag_50[DispenserId] = false;
+    DispenserDirectionFlag_25[DispenserId] = false;
     ReportWithPackageFilter(IDSFilter,"IDS_Dispenser_RefillStarted",__FILE__,__LINE__,(int)DispenserId,RpWarning,(int)(CurrentDispenserSpeed[DispenserId]),0);
 }
 void IDS_Dispenser_RefillEnded (char DispenserId,char  MicroSteps)
@@ -419,6 +454,8 @@ void IDS_Dispenser_RefillEnded (char DispenserId,char  MicroSteps)
     IDS_Dispenser_Data[DispenserId].numberofrefills++;
     //IDS_Dispenser_Data[DispenserId].direction = 1;
     IDS_Dispenser_Data[DispenserId].consumedinnanolitter = 0;
+    DispenserDirectionFlag_50[DispenserId] = false;
+    DispenserDirectionFlag_25[DispenserId] = false;
     ReportWithPackageFilter(IDSFilter,"IDS_Dispenser_RefillEnded",__FILE__,__LINE__,(int)DispenserId,RpWarning,(int)IDS_Dispenser_Data[DispenserId].numberofrefills,0);
 }
 void DispenserDataRequestFunc(MessageContainer* requestContainer)
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h
index 13032f49d..aedb49a62 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h
@@ -22,16 +22,6 @@
 #define NORMAL_COEF_DIVIDER 100
 typedef struct
 {
-    uint32_t startoffsetpulses;
-    uint32_t spoolbackingrate;
-    uint32_t segmentoffsetpulses;// the spool winding initial length in mm
-    uint32_t milimetersperrotation;
-    uint32_t SpoolBottomBackingRate;// the angle of the bottom of the spool
-    double NumberOfRotationPerPassage;  // how many rotations per spool passage
-    double diameter;
-}InternalWinderConfigStruc;
-typedef struct
-{
     bool                m_isEnabled;
     int32_t             m_SetParam;
     float               m_mesuredParam;
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h
index 4ce48a639..05cacd20e 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h
@@ -14,7 +14,18 @@
 #define WINDER_4_DANCER HARDWARE_DANCER_TYPE__RightDancer
 
 #define NUM_OF_DANCERS NUM_OF_ROTENC
-//} DANCER_ENUM;
+
+typedef struct
+{
+    uint32_t startoffsetpulses;
+    uint32_t spoolbackingrate;
+    uint32_t segmentoffsetpulses;// the spool winding initial length in mm
+    uint32_t milimetersperrotation;
+    uint32_t SpoolBottomBackingRate;// the angle of the bottom of the spool
+    double NumberOfRotationPerPassage;  // how many rotations per spool passage
+    double diameter;
+}InternalWinderConfigStruc;
+
 typedef enum threadMotorsEnum
 {
     FEEDER_MOTOR,
@@ -55,6 +66,7 @@ uint32_t LoadDancerConfigMessage(void);
 
 //uint32_t MotorPidRequestMessage(HardwarePidControl* request);
 extern float NumberOfRotationPerPassage; //debug for rotation per passage trials
+extern InternalWinderConfigStruc InternalWinderCfg;
 
 uint32_t Winder_Init(void);
 uint32_t Winder_Check_Cone(void);