merge

2 files changed, 29 insertions, 1 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 10286853e..4f78d2134 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -83,6 +83,8 @@ bool watchdogCriticalAlarm = false;
 
 uint32_t msec_millisecondCounter = 0;
 
+extern bool Machine_Idle_Mode;
+
 MillisecMotorDataStruc ScrewSetMaxSpeedPending = {0};
 MillisecMotorDataStruc ScrewMovePending = {0};
 MillisecMotorDataStruc MotorData[NUM_OF_MOTORS] = {0};
@@ -446,7 +448,8 @@ uint32_t MillisecLowLoop(uint32_t tick)
         //Speed_Data = Calculate_Speed_Sensor_Velocity();
         //MillisecReadFromTempSensor(Sensor_Read, NULL);
         //if (Sensor_Read++ >= MAX_TEMPERATURE_SENSOR_ID) Sensor_Read = 0;
-        //Control_LED1_PWM();
+        if(Machine_Idle_Mode == true)
+            Machine_Idle_Breathing_Led();
     }
     if (Hundred_msTick)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index 898f7ec67..69820e306 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -51,6 +51,7 @@
 #include <inc/hw_ints.h>
 
 #include "drivers/adc_sampling/adc.h"
+#include "Modules/General/buttons.h"
 
 #include "control.h"
 #include "MillisecTask.h"
@@ -157,10 +158,20 @@ void ControlStop(void)
 uint32_t ControlActivityLed( uint32_t Parameter1)
 {
     static bool flag = false;
+    static uint8_t counter;
+    const uint8_t Blink_Freq = 15;//odd number
+
     if (flag==true)
     {
         COMM_RED_LED_ON;
         ACTIVITY_RED_LED_OFF; // Heaters indication - all the Heaters OFF
+        if(power.color == fastBILNK)
+            Pannel_Leds(POWER_ON_OFF,MODE_OFF);
+
+        if((power.color == BLINK) && (counter % Blink_Freq == 0) )
+        {
+            Pannel_Leds(POWER_ON_OFF,MODE_OFF);
+        }
         flag = false;
     }
     else
@@ -168,8 +179,22 @@ uint32_t ControlActivityLed( uint32_t Parameter1)
         COMM_RED_LED_OFF;
         if (HeaterActive > 0)// Blink the led on heating
             ACTIVITY_RED_LED_ON;// Heaters indication - at least one of  the Heaters is ON
+
+        if(power.color == fastBILNK)
+            Pannel_Leds(POWER_ON_OFF,MODE_ON);
+
+        if((power.color == BLINK) && (counter % Blink_Freq == 0) )
+        {
+            Pannel_Leds(POWER_ON_OFF,MODE_ON);
+        }
+
         flag = true;
     }
+
+    if (counter < 0xFF)
+        counter++;
+    else
+        counter = Blink_Freq + 1;
 return OK;
 }
 uint32_t ControlEmptyCBFunction(uint32_t IfIndex, uint32_t ReadValue)