aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control/control.c
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/control.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/control.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index 07214d240..80afb7ac6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -55,6 +55,7 @@
#include "control.h"
#include "MillisecTask.h"
+#include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
/******************** Definitions ********************************************/
#define MAX_TANGO_CONTROL_DEVICES 100
/******************** STRUCTURES AND ENUMs ********************************************/
@@ -164,6 +165,9 @@ uint32_t ControlActivityLed( uint32_t Parameter1)
{
COMM_RED_LED_ON;
ACTIVITY_RED_LED_OFF; // Heaters indication - all the Heaters OFF
+ if(FPGA_WD_Occurred == true)
+ ACTIVITY_GREEN_LED_ON;
+
if(power.color == fastBILNK)
Pannel_Leds(POWER_ON_OFF,MODE_OFF);
else
@@ -219,6 +223,8 @@ uint32_t ControlActivityLed( uint32_t Parameter1)
if (HeaterActive > 0)// Blink the led on heating
ACTIVITY_RED_LED_ON;// Heaters indication - at least one of the Heaters is ON
+ ACTIVITY_GREEN_LED_OFF;
+
if(power.color == fastBILNK)
Pannel_Leds(POWER_ON_OFF,MODE_ON);
else
@@ -288,13 +294,14 @@ void ControlStart(void)
if (ControlRestart == false)
{
ControlRestart = true;
- MillisecStart();
ROM_TimerLoadSet(Control_timerBase, TIMER_A,120000+(ControlPhaseDelay*120)/*one millisecond*/);
TimerEnable(Control_timerBase, TIMER_A);
ADCAcquireStart(0,1);
AddControlCallback( ControlEmptyCBFunction, eHundredMillisecond, ControlActivityLed,0, 0, 0 );
+ SysCtlDelay(12000000);
+ MillisecStart();
}
}