aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/StateMachines
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-10-17 23:33:09 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-10-17 23:33:09 +0300
commitb8ff21ed2013c5c2bea14d735786480d63fb0d67 (patch)
tree0c552369f89162857b2382fe081a2a8b637bf72a /Software/Embedded_SW/Embedded/StateMachines
parentc68676b48d75a2f574309e8c070ed87821278e42 (diff)
downloadTango-b8ff21ed2013c5c2bea14d735786480d63fb0d67.tar.gz
Tango-b8ff21ed2013c5c2bea14d735786480d63fb0d67.zip
add relevant blowers to temperature string. send again temperatures atring on prepare ready
Diffstat (limited to 'Software/Embedded_SW/Embedded/StateMachines')
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index e74054a3c..da9b6a893 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -73,6 +73,7 @@
#include "drivers/Motors/Motor.h"
#include <Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h>
#include "drivers/FPGA/Full_Vme/FPGA_Programming_Up.h"
+#include "drivers/Heater/TemperatureSensor.h"
#include "./printingSTM.h"
#include "modules/thread/thread_ex.h"
@@ -111,6 +112,7 @@ char ErrorMsg[100];
ModuleStateEnum PrepareWaiting[MAX_SYSTEM_MODULES] = {ModuleIdle,ModuleIdle,ModuleIdle,ModuleIdle,ModuleIdle};
double job_length = 0.0;
+char infomsg[190];
/********************************************************************************************
* functions describes motor operation flow and movement state during profile execution
@@ -290,6 +292,10 @@ uint32_t PrepareReady(int ModuleId, ModuleStateEnum result)
if (PrepareWaiting[ModuleId] == ModuleWaiting)
PrepareWaiting[ModuleId] = ModuleDone;
}
+ TemperatureListString(infomsg);
+ Report(infomsg, __FILE__, __LINE__, ready, RpError, status, 0);
+ SendJobProgress(0.0,0,false, infomsg);
+
SendJobProgress(0.0, 0, false, "Prepare Ready");
if (status == OK) Message.messageId = PreparationResultsOk;
else Message.messageId = PreparationResultsFail;
@@ -1020,8 +1026,6 @@ void JobRequestFunc(MessageContainer* requestContainer)
}
}
//********************************************************************************************************************
-char logmsg[254];
-char infomsg[254];
uint8_t JobStatusBuffer[400];
ResumeCurrentJobResponse resumeresponse = RESUME_CURRENT_JOB_RESPONSE__INIT;
JobResponse JobResponseMsg = JOB_RESPONSE__INIT;