Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

5 files changed, 44 insertions, 18 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 37db3f84c..931b6674f 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -671,14 +671,15 @@ uint32_t AlarmHandling_ControlTrigger(uint32_t IfIndex, uint32_t ReadValue)
 }
 void AlarmHandlingSetAlarm(uint32_t AlarmId, bool value)
 {
-    AlarmHandlingMessageStruc Message;
+    AlarmHandlingInternalSetAlarm( AlarmId, value);
+    /*AlarmHandlingMessageStruc Message;
 
     //send message to the Millisec task
     Message.messageId = AlarmHandlingAlarm;
     Message.AlarmId = AlarmId;
     Message.Value = value;
     if (AlarmHandlingMsgQ != NULL)
-        Mailbox_post(AlarmHandlingMsgQ , &Message, BIOS_NO_WAIT);
+        Mailbox_post(AlarmHandlingMsgQ , &Message, BIOS_NO_WAIT);*/
 }
 void AlarmHandlingInternalSetAlarm(uint32_t AlarmId, bool value)
 {
@@ -702,7 +703,7 @@ void AlarmHandlingInternalSetAlarm(uint32_t AlarmId, bool value)
                         AlarmState[Alarm_i].EventPtr->message = AlarmItem[Alarm_i].EventName;
 	                    AlarmState[Alarm_i].Status = value;
                     }
-                    Report("Alarm ON ", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, RpMessage, value, Alarm_i);
+                    Report("Alarm ON ", __FILE__,AlarmState[Alarm_i].EventPtr,AlarmItem[Alarm_i].EventType, RpMessage, value, Alarm_i);
                 }
                 else
                 {
@@ -1042,7 +1043,7 @@ void SendEventNotifications(void)
     }
 
     response.n_events = 0;
-
+    UInt Key = Task_disable();
     for (i = 0;i<MAX_SYSTEM_ALARMS;i++)
     {
         if (AlarmState[i].Status == true)
@@ -1071,6 +1072,7 @@ void SendEventNotifications(void)
         else
         {
             LOG_ERROR(response.n_events,"events malloc error");
+            Task_restore(Key);
             return;
         }
     }
@@ -1078,6 +1080,7 @@ void SendEventNotifications(void)
     {
         response.events = NULL;
     }
+    Task_restore(Key);
     responseContainer = createAllocatedContainer(MESSAGE_TYPE__StartEventsNotificationResponse,  AlarmHandlingToken, false, &response, &start_events_notification_response__pack, &start_events_notification_response__get_packed_size,&alarm_response_buffer);
     responseContainer.continuous = true;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index e6b643903..f0edc56ab 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -129,7 +129,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
             EmbeddedParameters.has_openvalvetimeout = true;
             EmbeddedParameters.openvalvetimeout = 250;
             EmbeddedParameters.has_initialdispenserpressure = true;
-            EmbeddedParameters.initialdispenserpressure = 0.08;
+            EmbeddedParameters.initialdispenserpressure = 1.08;
             EmbeddedParameters.has_initialdispensertimeout = true;
             EmbeddedParameters.initialdispensertimeout = 60000;
             EmbeddedParameters.has_initialdispensertimelag = true;
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index af2ca0a13..cd748fd5c 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -214,7 +214,7 @@ void FreeBrushStopFileData(JobDescriptionFileBrushStop *BrushStop);
          DispenserUsedInJob[CLEANER_DISPENSER] = true;
      if (JobTicket->enablelubrication == true)
      {
-         DispenserUsedInJob[LUBRICANT_DISPENSER] = true;
+         //DispenserUsedInJob[LUBRICANT_DISPENSER] = true;
          lookForLubrication = true;
      }
 
@@ -329,7 +329,7 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
          DispenserUsedInJob[CLEANER_DISPENSER] = true;
      if (JobTicket->enablelubrication == true)
      {
-         DispenserUsedInJob[LUBRICANT_DISPENSER] = true;
+         //DispenserUsedInJob[LUBRICANT_DISPENSER] = true;
          lookForLubrication = true;
      }
      if (JobTicket->uploadstrategy == JOB_UPLOAD_STRATEGY__JobDescriptionFile)
@@ -561,11 +561,11 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
      int NumofReadyDispensers = 0;
      //REPORT_MSG((int)DispenserPrepareControlId, "Prepare Callback");
 
-     DispenserBuildTimeCounter+=eOneSecond;
+     DispenserBuildTimeCounter+=500;
 
-     if (DispenserBuildTimeCounter<=(3*eOneSecond))
+     if (DispenserBuildTimeCounter<(2*eOneSecond))
      {
-         REPORT_MSG(DispenserBuildTimeCounter,"waiting 3 seconds for pressure changes");
+         REPORT_MSG(DispenserBuildTimeCounter,"waiting 2 seconds for pressure changes");
          return OK;
      }
      for (i = 0; i < MAX_DYE_DISPENSERS; i++)
@@ -573,7 +573,7 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
          //IDS_StopHomeDispenser(i);
          if (DispenserUsedInJob[i] == true) //we actually should check for all dispensers
          {
-             if (GetDispenserPressure(i) > 1.0)
+             if (GetDispenserPressure(i) > 0.80)
                  NumofReadyDispensers++;
          }
      }
@@ -632,8 +632,8 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
     }
 
     PrepeareSpeed = JobTicket->processparameters->dyeingspeed*JobTicket->processparameters->maxinkuptake*1.30;
-    REPORT_MSG((int)JobTicket->processparameters->dyeingspeed, "dyeing speed");
-    REPORT_MSG((int)JobTicket->processparameters->maxinkuptake, "max ink uptake");
+    //REPORT_MSG((int)JobTicket->processparameters->dyeingspeed, "dyeing speed");
+    //REPORT_MSG((int)JobTicket->processparameters->maxinkuptake, "max ink uptake");
 
     if (HeaterCheckReady() == true)
     {
@@ -669,7 +669,8 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
          for (i = 0; i < MAX_DYE_DISPENSERS; i++)
          {
              dispenserspeed = PrepeareSpeed/MotorsCfg[DispenserIdToMotorId[i]].microstep;
-             REPORT_MSG((int)dispenserspeed, "Prepare Speed");
+             dispenserspeed = 480;
+             Report("Prepare Speed",__FILE__,__LINE__,i,RpWarning,(int)dispenserspeed,0);
              //IDS_StopHomeDispenser(i);
              if (DispenserUsedInJob[i] == true) //we actually should check for all dispensers
              {
@@ -678,7 +679,7 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
          }
      }
      DispenserBuildTimeCounter = 0;
-     DispenserPrepareControlId = AddControlCallback( IDS_Prepare_Callback, eOneSecond,TemplateDataReadCBFunction ,0, 0, 0 );
+     DispenserPrepareControlId = AddControlCallback( IDS_Prepare_Callback, 500,TemplateDataReadCBFunction ,0, 0, 0 );
 
  }
  //********************************************************************************************************************
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index c6f2526db..c3b94c01f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -25,6 +25,12 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
 
     ProgressResponse response = PROGRESS_RESPONSE__INIT;
 
+    if((request->amount == 0xDE) && (request->delay < 8) && (request->delay >= 0)) // read dispenser type + LS status
+    {
+        response.progress = ((Dispenser_struct[request->delay].Type) << 8) + Dispenser_struct[request->delay].Status;
+        response.has_progress = true;
+    }
+    else
     if((request->amount == 0xCF) && (request->delay == 0xCF)) //Create File System on the Drive
     {
         FRESULT iFResult = Init_Flash_File_System(true);
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
index 8aa358e32..7d24f9618 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
@@ -269,7 +269,7 @@ U8 CartridgeWasteFilling(bool status)
             //Pannel_Leds(PANEL_BUTTON_OR_CRAT_ID Pannel_Led_Id, OPERATION_MODE LED_Mode); //set cartridge led color slow blink
             //write RFID status
         }
-        SetWastePump(OPEN);
+        // close that line for only ITMA !!! SetWastePump(OPEN);  ToDo
         //WHS_info.WHS_pump.time = 0;
         REPORT_MSG(WHS_empty," ------------ WHS WHS_empty start PUMP  ----------------- ");
         ret=OK;
@@ -278,8 +278,24 @@ U8 CartridgeWasteFilling(bool status)
     {
         SetWastePump(CLOSE);
         Valve_Set(VALVE_WASTE_TANK, waste_cartridge2);  //set the valve direction set to low POWER !!!
-        Pannel_Leds( CART_2,  MODE_OFF);                //set led color
-        Pannel_Leds( CART_3,  MODE_OFF);                //set led color
+
+        switch (WHS_info.active_cartridge)
+           {
+              case waste_cartridge1:
+                  Pannel_Leds( CART_2,  MODE_OFF);                //set led color
+                  REPORT_MSG(WHS_empty," ------------ WHS  waste_cartridge1 is used please replace it ----------------- ");
+                  break;
+              case waste_cartridge2:
+                  Pannel_Leds( CART_3,  MODE_OFF);                //set led color
+                  REPORT_MSG(WHS_empty," ------------ WHS  waste_cartridge2 is used please replace it ----------------- ");
+                  break;
+              case no_waste_cartridge:
+
+                  break;
+              default:
+                  break;
+           }
+
 
         //write RFID status
     }