reset notifications, IDS bug (skip pre run #4199)

5 files changed, 37 insertions, 9 deletions

diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index 58e6ccba0..850f62181 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -684,7 +684,7 @@ typedef enum
     NUM_OF_MIDTANKS,
 } MidTank_t;
 
-
+extern char* LiquidTypes[10];
 extern PackageHandle ControlFilter;
 extern PackageHandle HeatersFilter;
 extern PackageHandle JobFilter  ;
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
index 750d02f6b..e9d5cfc07 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
@@ -50,7 +50,7 @@ uint32_t MCU_E2PromRead(int Address,uint32_t *Data)
     if (Address>=MAX_EEPROM_STORAGE)
     {
         Report("MCU_E2PromRead Error",__FILE__,__LINE__,Address,RpWarning,*Data,0);
-        return ERROR;
+        //return ERROR;
     }
 #ifndef EVALUATION_BOARD
     EEPROMRead((uint32_t *)Data,Address*4, 4);
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index cf99a9c03..45494e30e 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -12,6 +12,7 @@
 #include <ti/sysbios/knl/Semaphore.h>
 */
 #include <driverlib/sysctl.h>
+#include "driverlib/eeprom.h"
 
 #include "Drivers/USB_Communication/USBCDCD.h"
 #include "Drivers/I2C_Communication/I2C.h"
@@ -135,7 +136,20 @@ Void MyswitchFxn(Task_Handle prev, Task_Handle next)
     PrevTask = prev;
     NextTask = next;
 }
+void updateresetreasonineeprom(void)
+{
+#define Head_Address 40
+#define Max_Address 100
+    int Head;
+    uint32_t RESC = SysCtlResetCauseGet();
+
+    EEPROMRead(&Head,Head_Address, 4);
+    if (Head>=Max_Address) Head=0;
+    Head++;
+    EEPROMProgram(&Head, Head_Address, 4);
+    EEPROMProgram(&RESC, Head_Address+Head, 4);
 
+}
 /* ======== errHook ======== */
 Void errHook(Error_Block *eb)
 {
@@ -235,7 +249,7 @@ int main(void)
     // Enable interrupts to the processor.
     //
     ROM_IntMasterDisable();
-	//Set the clock 120MHz
+    //Set the clock 120MHz
 	uint32_t ui32SysClock = MAP_SysCtlClockFreqSet((SYSCTL_XTAL_25MHZ | SYSCTL_OSC_MAIN | SYSCTL_USE_PLL | SYSCTL_CFG_VCO_480), SYS_CLK_FREQ);
 
     // Enable the system tick.
@@ -253,6 +267,7 @@ int main(void)
     uint32_t Data,i;
 
    MCU_E2PromInit();
+   updateresetreasonineeprom();
 
 #endif
     #ifdef EVALUATION_BOARD
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 95f6420c1..d567f8ad9 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -78,6 +78,7 @@ int lInterSegmentLength = 0;
  int InterSegmentStepsLimit = 0,InterSegmentStepsCount = 0;
  bool PreSegmentWCFStarted = false;
  bool PreSegmentPrepareStarted = false;
+ char* LiquidTypes[10] = {"Cy","Ma","Ye","Bl","TI","Lu","Cl","LC","LM","LY"};
 
  uint32_t InterSegmentStartSprayCleaner = 0;
  uint32_t InterSegmentStartRocking = 0;
@@ -984,7 +985,7 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
  //********************************************************************************************************************
   uint32_t IDS_PreSegmentPrepare_Callback(uint32_t DispenserId, uint32_t ReadValue)
   {
-      bool pressureReady = false;
+      bool PSpressureReady = false;
       int i;
       int NumofReadyDispensers = 0;
       TimerMotors_t  HW_Motor_Id;
@@ -1035,9 +1036,9 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
           ReportWithPackageFilter(IDSFilter,"IDS_PreSegmentPrepare_Callback",__FILE__,DispenserBuildTimeCounter,InterSegmentStepsCount,RpWarning,(int)NumOfActiveDispensers,0);
 
       if (NumofReadyDispensers>=NumOfActiveDispensers)
-          pressureReady = true;
+          PSpressureReady = true;
 
-      if ((DispenserBuildTimeCounter >= DispenserPrepareTimeout)||(pressureReady == true))
+      if ((DispenserBuildTimeCounter >= DispenserPrepareTimeout)||(PSpressureReady == true))
       {
           ReportWithPackageFilter(IDSFilter,"IDS_PreSegmentPrepare_Callback SafeRemoveControlCallback",__FILE__,DispenserPrepareControlId,InterSegmentStepsCount,RpWarning,(int)NumOfActiveDispensers,0);
           SafeRemoveControlCallback(DispenserPrepareControlId, IDS_Prepare_Callback );
@@ -1919,6 +1920,8 @@ uint32_t IDSSegmentState(void *SegmentDetails, int SegmentId)
          FreeBrushStopFileData(FileBrushStop);
      FileBrushStop = NULL;
      FirstBrushStop = NULL;
+     pressureReady = false;
+     endOfPrepareWCF = false;
      if (DispenserPrepareControlId != 0xFF)
      {
          RemoveControlCallback(DispenserPrepareControlId, IDS_Prepare_Callback );
diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt
index e05978325..88722710c 100644
--- a/Software/Embedded_SW/Embedded/Software Release Notes.txt
+++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt
@@ -1,11 +1,21 @@
-Embedded SW Release note - Version 1.5.3(1) - Pack 3
+Embedded SW Release note - Version 1.5.3(2) - Pack 3
 =============================================================
+for QA
 RFID - suprressed
-separate tasks for RFID and dispensers EEPROM, and for the shinko
-some bug fixes (persistent alarms, most of temperature spikes
+some bug fixes (persistent alarms, most of temperature spikes)
 remove repeated restart protections
 Blowers - read V0 on job prepare
 Temperature build prepare failure handling
+End heaters before upgrade restart (#4172)
+fix alarm reports on prepare stage and in logs
+#4170 
+
+other
+separate tasks for RFID and dispensers EEPROM, and for the shinko
+support restart research
+procedure stub - better than progress!!
+store process parameter as long as they are not 0
+some work for light colors and for BTSR
 
 
 Embedded SW Release note - Version 1.5.2(3) - Pack 3