remove file writing in dispenser data

5 files changed, 9 insertions, 8 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 b3005a7fe..60dfd6703 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,5,5};
+TangoVersion_t _gTangoVersion = {1,4,5,6};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
  char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d
diff --git a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c
index a17bff871..e6a20904e 100644
--- a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_VOC_Sensor.c
@@ -171,9 +171,9 @@ uint8_t  Calculate_Gas_Power_Consumption() // WHS
             if (VOC_Index%60 == 0)
             {
                 CalculateVOCAlarms();
+                Report("Calculate_Gas_Data Sample,VADC,Vsense",__FILE__,VsampleInBits,(int)VADC,RpWarning,(int)(VSensor*1000),0);
             }
             //Report("Calculate_Gas_Power_Consumption",__FILE__,__LINE__,(int)i,RpWarning,VOC_Index,0);
-            Report("Calculate_Gas_Data Sample,VADC,Vsense",__FILE__,VsampleInBits,(int)VADC,RpWarning,(int)(VSensor*1000),0);
 
             return i;//PPM
         }
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 2a67a9e58..574cc2573 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -998,6 +998,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
                     //Heaters OFF until coming into the proportional band
                     HeaterRecalculateSharedHeatersParams(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain,0);
                     HeaterRecalculateSharedHeatersParams(HARDWARE_PID_CONTROL_TYPE__DryerHeaterSecondary,0);
+                    ReportWithPackageFilter(HeatersFilter, "AC OverHeat - turned off",__FILE__,readValue,HeaterReady[index],RpError, HeaterAtTemp[index],0);
                     return OK;
                 }
         if (readValue < ((HeaterCmd[index].targettemperatue * (100-HeaterControl[index].outputproportionalband))/100))
@@ -1195,7 +1196,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
                     DeActivateHeater(index);
                     HeaterRecalculateHeaterParams(index, 0);
                     //Heaters OFF until coming into the proportional band
-                    //ReportWithPackageFilter(HeatersFilter,"DC HEATER Over temperature ", __FILE__,__LINE__,index, RpMessage, readValue, 0);
+                    ReportWithPackageFilter(HeatersFilter,"HEATER Over temperature ", __FILE__,__LINE__,index, RpMessage, readValue, 0);
                     return OK;
                 }
         if (readValue < ((HeaterCmd[index].targettemperatue * (100-HeaterControl[index].outputproportionalband))/100))
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
index 8f1c0d565..b9ab97714 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
@@ -248,7 +248,7 @@ void IDS_Dispenser_Content_Init (void)
         StoredDispenserData = (DispenserRunningData*)(DISPENSERS_MAP_IN_FLASH+4);
         havedata = true;
     }
-    else
+    /*else
     {
         Fresult = FileRead(DispenserStorePath, &Bytes, &buffer);
         if (Fresult == FR_OK)
@@ -256,7 +256,7 @@ void IDS_Dispenser_Content_Init (void)
             StoredDispenserData = (DispenserRunningData*)buffer;
             havedata = true;
         }
-    }
+    }*/
     if (havedata == true)
     {
         for(i=0;i<MAX_SYSTEM_DISPENSERS;i++)
@@ -302,12 +302,12 @@ uint32_t IDS_Dispenser_Store_Data (void)
         ReadAppAndProgram(DISPENSERS_MAP_IN_FLASH, 4,&response_size);
         ReadAppAndProgram(DISPENSERS_MAP_IN_FLASH+4, response_size, IDS_Dispenser_Data);
 
-        Status = FileWrite(IDS_Dispenser_Data,response_size,DispenserStorePath,BIOS_NO_WAIT);
+        /*Status = FileWrite(IDS_Dispenser_Data,response_size,DispenserStorePath,BIOS_NO_WAIT);
         if (Status == FR_OK)
         {
             DispenserDataUpdated = false;
             REPORT_MSG(msec_millisecondCounter - timing, "Updating dispensers file - time");
-        }
+        }*/
     }
 
     return Status;
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 3b5d2a3e9..bf0f361fd 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -327,7 +327,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
 #ifdef READ_SCREW_ENCODER
     int WinderRun;
      WinderRun = abs(ScrewLocationRun[1] - ScrewLocationRun[0]);
-     if ((WinderRun < 30000)&&(ScrewDirectionChangeCounter >= 30))
+     if ((WinderRun < 30000)&&(WinderMotorSpeedRollOver == true))
      {
          WinderRunSamples++;
          WinderRunSum+=WinderRun;