MERGE

2 files changed, 23 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt
index ba6219f67..7b7666b5f 100644
--- a/Software/Embedded_SW/Embedded/Software Release Notes.txt
+++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt
@@ -1,3 +1,21 @@
+Embedded SW Release note - Version 1.3.9.9 - Itma Candidate 3
+=============================================================
+Machine: 
+	Watchdog restart time is now 20 seconds, to avoid unintended restarts
+Modules:
+	IDS - Build pressure  on job prepare. currently hard coded: building on 130%, for at least 1 bar, or 1 minute.
+	Heaters: do not restart the heating controlled process if the setpoint does not changes
+	Connection: Embedded does not reconnect until HW is initialized
+	Alarm handling: many unusful alarm removed: motors, heating process, midtank empty
+	Diagnostic data reduced significantly in frequency
+Drivers:
+	VOC Gas sensor fixes.
+	Lubricant valve workaround until FPGA will be fixed
+	Encoder screw reading prepared (FPGA needs to be changed)
+Procedures:
+	Initializing - Dispensers Pressure buildup removed
+	Power down waits up to 1 hour (instead of 30 minutes) for cooling down
+	
 Embedded SW Release note - Version 1.3.9.5 - Itma Candidate 2
 =============================================================
 WATCHDOG Activated - embedded SW reset after 4 seconds of inactivity
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index 4979522e7..66473a3f8 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -616,8 +616,8 @@ void JobRequestFunc(MessageContainer* requestContainer)
         {
             //memcpy(CurrentJob, Ticket,TicketSize);
             CurrentJob = Ticket;
-            if (CurrentRequest!= NULL)
-                job_request__free_unpacked(CurrentRequest,NULL);
+//            if (CurrentRequest!= NULL)
+//                job_request__free_unpacked(CurrentRequest,NULL);
             CurrentRequest = request;
             jobCatch = 0;
             n_segments = 0;
@@ -816,8 +816,10 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes
         if (CurrentRequest!= NULL)
         {
             jobCatch++;
-            job_request__free_unpacked(CurrentRequest,NULL);
+        //    ROM_IntMasterDisable();
+        //    job_request__free_unpacked(CurrentRequest,NULL);
             CurrentRequest = NULL;
+        //    ROM_IntMasterEnable();
         }
         JobStopReporting();
         JobMessageStruc JobMessage;