aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/AlarmHandling
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-06-14 17:26:35 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-06-14 17:26:35 +0300
commit2a307f7c34e33a02fb605cd6bb4fa913cc17b805 (patch)
treea348b1f8968ff4b3765ccc01572aea5c822eadaa /Software/Embedded_SW/Embedded/Modules/AlarmHandling
parent1b5906087017b5092dd51cc1a639a95e7f41701d (diff)
downloadTango-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/AlarmHandling')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 0dc70efaa..f3ac52a7b 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -24,6 +24,7 @@
#include "drivers/FPGA/FPGA_SPI_Comm.h"
#include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
#include "drivers/FPGA/FPGA.h"
+#include "drivers/FPGA/Full_Vme/FPGA_Programming_Up.h"
#include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h"
#include "drivers/I2C_Communication/Dispenser_Card/IO_Ports/Dispenser_IO.h"
#include <Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h>
@@ -1636,6 +1637,8 @@ void SendEventNotifications(void)
LargeMessagesAH++;
return;
}
+ if (FPGABurningActive==true)
+ return;
EventsResponse.n_events = 0;
//UInt Key = Task_disable();