version 1.5.3.4

6 files changed, 53 insertions, 30 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 e27127c56..5392a415e 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,5,3,3};
+TangoVersion_t _gTangoVersion = {1,5,3,4};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
 
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index d80db5d73..2850f666e 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -85,7 +85,8 @@ bool isReportActive(void)
 }
 uint32_t OpenLogFile(void)
 {
-    /*int len;
+#ifdef STORE_DEBUG_LOGS
+    int len;
     uint32_t Bytes = 0;
     LogFileHandle = my_malloc(sizeof(FIL));
     if (LogFileHandle)
@@ -105,19 +106,22 @@ uint32_t OpenLogFile(void)
     else
         LogFresult = FR_INT_ERR;
 
-    return LogFresult;*/
+    return LogFresult;
+#endif	
     return OK;
 }
 uint32_t CloseLogFile(void)
 {
     /* perform default error output */
-    /*int len;
+#ifdef STORE_DEBUG_LOGS
+    int len;
     uint32_t Bytes = 0;
     len = usnprintf(RepMessage, 80, "Closing Log File %s %s",__DATE__, __TIME__);
     LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
     LogFresult = f_close(LogFileHandle);
     LogFileHandle = NULL;
-    return LogFresult;*/
+    return LogFresult;
+#endif	
     return OK;
 
 }
@@ -130,7 +134,8 @@ uint32_t LogToFile(char *message,       /* The formatted message
 {
 
         /* print user supplied error code */
-/*    uint32_t Bytes = 0;
+#ifdef STORE_DEBUG_LOGS
+    uint32_t Bytes = 0;
     int len;
     if (LogFileHandle == NULL)
         return OK;
@@ -141,7 +146,7 @@ uint32_t LogToFile(char *message,       /* The formatted message
         f_lseek(LogFileHandle, 0);
 
     return LogFresult;
-    */
+#endif	
     return OK;
 
 }
diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index 7b0c4c215..291c94e9d 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -24,6 +24,10 @@
 //#define DISPESER_TEST
 //#define FPGA_WATCHDOG_DISABLE
 
+#ifndef WATCHDOG
+#define STORE_DEBUG_LOGS
+#endif
+//#define STORE_DEBUG_LOGS
 //#define FOUR_WINDERS
 #ifdef FOUR_WINDERS
 #define BTSR_NO_FEEDER_TFU
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 160c3a0b5..db4535e06 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -1006,30 +1006,33 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
                 }
             }
     }
-    if ((AlarmState[Alarm_i].Status == true)&&(FoundReason == JOB_OK))
+    for (Alarm_i = 0;Alarm_i<NumOfSystemAlarms;Alarm_i++)
     {
-        if(AlarmItem[Alarm_i].Severity>=DEBUG_LOG_CATEGORY__Error)
+        if ((AlarmState[Alarm_i].Status == true)&&(FoundReason == JOB_OK))
         {
-            ReportWithPackageFilter(AlarmFilter,"an alarm existing before job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
-            switch (AlarmItem[Alarm_i].EventType )
+            if(AlarmItem[Alarm_i].Severity>=DEBUG_LOG_CATEGORY__Error)
             {
-                case EVENT_TYPE__INSUFFICIENT_AIR_FLOW:
-                case EVENT_TYPE__VOC_SENSOR_ALARM_TIME:
-#warning unmark to prevent job on voc alarm//case EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE:
-                //case EVENT_TYPE__POWER_UP_BIT_FAILURE:
-                    FoundReason = JOB_WASTE_HANDLING_PROBLEM;
-                    AlarmId = Alarm_i;
-                    ReportWithPackageFilter(AlarmFilter,"an alarm preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
-                    break;
-                case EVENT_TYPE__ELECTRICAL_CABINET_OVERTEMPERATURE:
-                case EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE:
-                case EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE_2:
-                    FoundReason = JOB_TEMPERATURE_ALARM;
-                    AlarmId = Alarm_i;
-                    ReportWithPackageFilter(AlarmFilter,"machine internal over-temperature is preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
-                    break;
-                default:
-                    break;
+                ReportWithPackageFilter(AlarmFilter,"an alarm existing before job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
+                switch (AlarmItem[Alarm_i].EventType )
+                {
+                    case EVENT_TYPE__INSUFFICIENT_AIR_FLOW:
+                    case EVENT_TYPE__VOC_SENSOR_ALARM_TIME:
+                    //case EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE:
+                    //case EVENT_TYPE__POWER_UP_BIT_FAILURE:
+                        FoundReason = JOB_WASTE_HANDLING_PROBLEM;
+                        AlarmId = Alarm_i;
+                        ReportWithPackageFilter(AlarmFilter,"an alarm preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
+                        break;
+                    case EVENT_TYPE__ELECTRICAL_CABINET_OVERTEMPERATURE:
+                    case EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE:
+                    case EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE_2:
+                        FoundReason = JOB_TEMPERATURE_ALARM;
+                        AlarmId = Alarm_i;
+                        ReportWithPackageFilter(AlarmFilter,"machine internal over-temperature is preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
+                        break;
+                    default:
+                        break;
+                }
             }
         }
     }
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 879aa84a6..c196ea031 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -693,8 +693,6 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
                      for (Dispenser_i = 0; Dispenser_i < n_dispensers; Dispenser_i++)
                      {
                          DispenserId = Dispensers[Dispenser_i]->index;
-                         if (DispenserId!=Dispenser_i)
-                             ReportWithPackageFilter(IDSFilter,"DispenserId!=Dispenser_i",__FILE__,__LINE__,DispenserId,RpWarning,(int)Dispenser_i,0);
                          HW_Motor_Id = DispenserIdToMotorId[DispenserId];
                          if (MotorsCfg[HW_Motor_Id].hardwaremotortype
                                  != DispenserIdToMotorId[DispenserId])
@@ -703,6 +701,8 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
                          {
                              continue;
                          }
+                         if (DispenserId!=Dispenser_i)
+                             ReportWithPackageFilter(IDSFilter,"DispenserId!=Dispenser_i",__FILE__,__LINE__,DispenserId,RpWarning,(int)Dispenser_i,0);
                          //(Speed*uStep*PPR)/((2*PI*Dispenser_Radius)
                          segmentfirst_speed = Dispensers[Dispenser_i]->nanolitterpersecond
                                  / Dispensers[Dispenser_i]->nanoliterperpulse;
diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt
index e0475b1cf..402a40e2e 100644
--- a/Software/Embedded_SW/Embedded/Software Release Notes.txt
+++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt
@@ -1,3 +1,14 @@
+Embedded SW Release note - Version 1.5.3(4) - Pack 3
+=============================================================
+remove ErrFile.txt handling (storing logs while report is disconnected) - from release version
+add logs and indications for file handling
+fix idle problem (#4269)
+improve timing (QA - notice the COMM led blinking rate)
+add parameters setting (B,C) for head air flow calculation.
+remove low flow alarm during head flow recalibration
+fix screw going back at the end of job time
+bug #4240 (and others) - restart at the beginning of a job - resolved!
+
 Embedded SW Release note - Version 1.5.3(3) - Pack 3
 =============================================================
 for QA