suspend FAN checking pending tests. initial fix for dispensers storage

2 files changed, 14 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 8e4a36e62..5fe242436 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -499,9 +499,9 @@ uint32_t MillisecLowLoop(uint32_t tick)
             //Read_MidTank_Pressure_Sensor(Disp_i);
         }
         FPGA_GetAllDispensersValveBusyOCD();
-        temp = Read_Fans_Tacho();
+        /*temp = Read_Fans_Tacho();
         DrawerFansStatus = temp & 0x1F;
-        SystemFansStatus = temp & 0xE0;
+        SystemFansStatus = temp & 0xE0;*/
         KeepAliveOneSecondCall();
         for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++)
         {
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
index 1e33b99ca..7978e77bb 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
@@ -223,6 +223,12 @@ void IDS_Dispenser_Content_Init (void)
         for(i=0;i<MAX_SYSTEM_DISPENSERS;i++)
         {
             memcpy (&IDS_Dispenser_Data[i],StoredDispenserData->dispenserinfo[i],sizeof(DispenserRunningData));
+            IDS_Dispenser_Data[i].has_consumedinnanolitter = true;
+            IDS_Dispenser_Data[i].has_totalconsumedinnanolitter = true;
+            IDS_Dispenser_Data[i].has_direction = true;
+            IDS_Dispenser_Data[i].has_microsteps = true;
+            IDS_Dispenser_Data[i].has_numberofrefills = true;
+            IDS_Dispenser_Data[i].has_nanolitterperpulse = true;
         }
         free (buffer);
         dispenser_data__free_unpacked(NULL,StoredDispenserData);
@@ -239,12 +245,17 @@ void IDS_Dispenser_Content_Calculation (char DispenserId)
     TimerMotors_t  HW_Motor_Id = DispenserIdToMotorId[DispenserId];
     double consumedintimeframe = MotorDriverRequest[HW_Motor_Id].Speed*IDS_Dispenser_Data[DispenserId].microsteps*
             IDS_Dispenser_Data[DispenserId].nanolitterperpulse * dir;
+    //consumedintimeframe = 10+DispenserId;
     IDS_Dispenser_Data[DispenserId].consumedinnanolitter += consumedintimeframe;
     IDS_Dispenser_Data[DispenserId].totalconsumedinnanolitter += consumedintimeframe;
     if (DispenserId == 0)
     {
-        if (seconds_counter++>=3600)
+        if (seconds_counter++>=600)//3600)
         {
+            if (IDS_Dispenser_Data[DispenserId].consumedinnanolitter)
+            {
+                REPORT_MSG(IDS_Dispenser_Data[DispenserId].consumedinnanolitter,"Saving Dispenser Data" );
+            }
             seconds_counter = 0;
             IDSDispenserData.n_dispenserinfo = MAX_SYSTEM_DISPENSERS;
             IDSDispenserData.dispenserinfo = dispenserdata;