diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-14 17:26:35 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-14 17:26:35 +0300 |
| commit | 2a307f7c34e33a02fb605cd6bb4fa913cc17b805 (patch) | |
| tree | a348b1f8968ff4b3765ccc01572aea5c822eadaa /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 1b5906087017b5092dd51cc1a639a95e7f41701d (diff) | |
| download | Tango-2a307f7c34e33a02fb605cd6bb4fa913cc17b805.tar.gz Tango-2a307f7c34e33a02fb605cd6bb4fa913cc17b805.zip | |
new powerstep parameters, better handling of FPGA loading and tension parameters
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -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; |