aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/StateMachines
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-05-08 09:51:19 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-05-08 09:51:19 +0300
commitd5fd706b42a43f2b6399ae714ee45f49bb1fd66a (patch)
tree3bcd3329471840307d97766225c7749115df69dc /Software/Embedded_SW/Embedded/StateMachines
parent952b8d7f3c81d6943d0bbf665b74ff58ab8c1201 (diff)
downloadTango-d5fd706b42a43f2b6399ae714ee45f49bb1fd66a.tar.gz
Tango-d5fd706b42a43f2b6399ae714ee45f49bb1fd66a.zip
MERGE
Diffstat (limited to 'Software/Embedded_SW/Embedded/StateMachines')
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c8
1 files changed, 5 insertions, 3 deletions
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;