diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-06-17 14:44:21 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-06-17 14:44:21 +0300 |
| commit | 9d1a217a8410e36cb224e7d47f49326c0e92c474 (patch) | |
| tree | 94469fa5f08c47ffe5a1a3756b6d66ff80dd3b9f /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 487fc03281c2dfde034e73ad99bd74ec4f63f69a (diff) | |
| parent | 920fe3a098f304b6c65e1c37447138f0699ec70c (diff) | |
| download | Tango-9d1a217a8410e36cb224e7d47f49326c0e92c474.tar.gz Tango-9d1a217a8410e36cb224e7d47f49326c0e92c474.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 31c9be4ff..965ea30da 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -35,6 +35,7 @@ #include <Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h> #include <Drivers/I2C_Communication/I2C_Task.h> #include "drivers/FPGA/FPGA_SPI_Comm.h" +#include "drivers/FPGA/Full_Vme/FPGA_Programming_Up.h" #include "PMR/Stubs/StubHeatingTestRequest.pb-c.h" #include "PMR/Stubs/StubHeatingTestResponse.pb-c.h" @@ -1066,7 +1067,7 @@ } uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue) { - if (JobIsActive()||(MachineReadyForHeating == false)) + if (JobIsActive()||(MachineReadyForHeating == false)||(FPGABurningActive==true)) { Report("ThreadLoadButton called on job",__FILE__,__LINE__,LoadStages,RpMessage,ReadValue,0); return ERROR; |