bugs. stop job on temprature stabilization failure.

7 files changed, 11 insertions, 9 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 18ad17bee..c7353d491 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -93,7 +93,7 @@ uint32_t OpenLogFile(void)
         LogFresult = f_open(LogFileHandle,LogPath,FA_READ | FA_WRITE | FA_OPEN_ALWAYS);
         if (LogFresult == FR_OK)
         {
-            if (LogFileHandle->fsize < 50000)
+            if (LogFileHandle->fsize < 100000)
                 f_lseek(LogFileHandle, LogFileHandle->fsize);
             else
                 f_lseek(LogFileHandle, 0);
@@ -131,7 +131,7 @@ uint32_t LogToFile(char *message,       /* The formatted message
     if (LogFileHandle == NULL)
         return OK;
 
-    len = usnprintf(RepMessage, 300, "\r\n%s, file %s  line %d code %d sev %d,param %d",message,FileName, LineNumber,errorCode, Severity, parameter);
+    len = usnprintf(RepMessage, 300, "\r\nfile %s\t  line %d\t code %d\t sev %d,\tparam %d,\t %s",FileName, LineNumber,errorCode, Severity, parameter,message);
     LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
 
     return LogFresult;
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index 3485a1de2..cf99a9c03 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -146,7 +146,7 @@ Void errHook(Error_Block *eb)
     char message[300];
     int len;
 
-    STATUS_GREEN_LED_OFF;
+    //STATUS_GREEN_LED_OFF;
     ACTIVITY_GREEN_LED_OFF;
     COMM_GREEN_LED_OFF;
     Head_I2C_EXP1_0x40.ushort = 0;
@@ -154,6 +154,8 @@ Void errHook(Error_Block *eb)
     Head_Write_IO_Reg(0x40,LOW_AND_HIGH);
     Head_Write_IO_Reg(0x42,LOW);
 
+    ReportResetReason();
+
     STATUS_RED_LED_ON;
     ACTIVITY_RED_LED_ON;
     COMM_RED_LED_ON;
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index e650a9af7..e02bd8191 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -189,7 +189,7 @@ uint32_t ControlActivityLed( uint32_t Parameter1)
                 AlarmHandlingSetAlarm(EVENT_TYPE__FPGA_WATCHDOG_ACTIVATED,true);
                 if (JobIsActive())
                 {
-                    ReportWithPackageFilter(HeatersFilter, "Hardware Failure Error - abort job!",__FILE__,__LINE__,index,RpError, 0,0);
+                    Report("Hardware Failure Error - abort job!",__FILE__,__LINE__,EVENT_TYPE__FPGA_WATCHDOG_ACTIVATED,RpError, 0,0);
                     JobEndReason = JOB_MOTOR_ALARM;
                     usnprintf(AlarmReasonStr, 100, "Hardware Failure Error");
                     SendJobProgress(0.0,0,false, "Hardware Failure Error");
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index cdc6afa50..0726225df 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -143,7 +143,7 @@ uint32_t HWConfigurationInit(void)
         {
             AlarmHandlingSetAlarm (EVENT_TYPE__MACHINE_STATE_NO_CFG_FILE,ON);
             status = MACHINE_STATE_HW_CONFIG_FAILED;
-            STATUS_GREEN_LED_OFF;
+            //STATUS_GREEN_LED_OFF;
         }
         else
         {
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 2ae86fe4d..ba784aa44 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -1020,8 +1020,8 @@ void HeaterPrepareFailureCheck(void)
                 if (abs (HeaterPrepareFailureCheckTemperatures[i] - HeaterPreviousRead[i])<200) // no temperature move in the last 5 minutes
                 {
                     ReportWithPackageFilter(HeatersFilter,"HeaterPrepareFailureCheck",__FILE__,i,HeaterPrepareFailureCheckTemperatures[i],RpWarning,HeaterPreviousRead[i], 0);
-                    //PrepareReady(Module_Heaters,ModuleFail);
-                    //return;
+                    PrepareReady(Module_Heaters,ModuleFail);
+                    return;
                 }
             }
             HeaterPrepareFailureCheckTemperatures[i] = HeaterPreviousRead[i];
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index 5a764cfc4..8a3b20e57 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -1132,7 +1132,7 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue)
             SecondTry = false;
             Report("Calling State machine  2nd try",__FILE__,LoadStages,LoadStatus,RpMessage,SecondTry,0);
             load.color = BLINK;
-            if ((LoadStages == THREAD_LOAD_LIFT_DANCERS)
+            if (LoadStages == THREAD_LOAD_LIFT_DANCERS)
             {
                 LoadStages++;
                 LoadStatus = OK;
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 011488c49..a75241671 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -113,7 +113,7 @@ uint32_t InternalWindingConfigMessage(JobSpool* request)
         Report("limit switch start point offset",__FILE__,__LINE__,(int)(request->startoffsetpulses),RpWarning,(int)(request->limitswitchstartpointoffset), 0);
     }
     status |= MCU_E2PromRead(EEPROM_STORAGE_WINDER_CALIBRATION,&limitswitchstartpointoffset);
-    if ((status!= OK )||(limitswitchstartpointoffset == 0xFFFF))
+    if ((status!= OK )||(limitswitchstartpointoffset >= 200))
         limitswitchstartpointoffset = 0;
     Report("limit switch start point offset",__FILE__,(int)(request->startoffsetpulses),(int)(limitswitchstartpointoffset),RpWarning,status, 0);
     InternalWinderCfg.startoffsetpulses += limitswitchstartpointoffset;