merge

5 files changed, 32 insertions, 13 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 5c0ff852c..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>
@@ -72,6 +76,7 @@
 #include <Drivers/I2C_Communication/RFID_NFC/RFIDTagInfo.h>
 #include <Drivers/I2C_Communication/RFID_NFC/I2C_IFS_Mux.h>
 #include <Drivers/I2C_Communication/RFID_NFC/NFC.h>
+#include "Drivers/Uart_Comm/BTSR/BTSR.h"
 
 Task_Handle Millisecond_Task_Handle;
 /******************** Definitions  ********************************************/
@@ -730,11 +735,21 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 }
             }
         #endif
+
+        #ifdef USE_UART4_FOR_BTSR
+            //call every 100mSec
+            BTSR_State_Machine(0x01);
+        #endif
     }
     if (Gradient_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/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index 469e82aa8..2c67a623b 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -157,6 +157,7 @@ bool CartridgeInkFull()
 int GetCartridgeFillPercent()
 {
     double MidTank_Pressure = 0;
+    double percent;
 #ifdef IFS_DEBUG
     static int percent = 0;
     if (midTankState == MidTankStateFilling) {
@@ -169,7 +170,8 @@ int GetCartridgeFillPercent()
     return percent;
 #else
     MidTank_Pressure = Read_MidTank_Pressure_Sensor(midTankCartColor);
-    return (((MidTank_Pressure - midTankCapacity)* 100) / CARTRIDGE_CAPATICY);
+    percent = (((MidTank_Pressure - midTankCapacity)* 100) / CARTRIDGE_CAPATICY);
+    return percent;
 #endif
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
index 0f95fb2e2..7d68621e9 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
@@ -13,7 +13,7 @@
 
 #define CARTRIDGE_INK_TIMEOUT           420
 #define MidTank_Pressure_EMPTY          0.3
-#define CARTRIDGE_CAPATICY              1500
+#define CARTRIDGE_CAPATICY              1.5
 
 typedef enum{
     MidTankStateIdle,
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);