fix bug in pre-run PBU, and in dispensers 25%. 50% indications

4 files changed, 11 insertions, 8 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
index 404fbf3de..99d5faf07 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
@@ -400,12 +400,12 @@ void IDS_Dispenser_Content_Calculation (char DispenserId)
         {
             ReportWithPackageFilter(IDSFilter,"IDS_Dispenser_Data ",__FILE__,DispenserId,(int)IDS_Dispenser_Data[DispenserId].consumedinnanolitter,RpWarning,(int)CurrentDispenserSpeed[DispenserId],0);
         }
-        if ((Dispenser_Id_to_LS_50_Id[DispenserId])&&(DispenserDirectionFlag_50[DispenserId]==false))
+        if ((Dispenser_Id_to_LS_50_Id[DispenserId] == LIMIT)&&(DispenserDirectionFlag_50[DispenserId]==false))
         {
             DispenserDirectionFlag_50[DispenserId]= true;
             ReportWithPackageFilter(IDSFilter,"Dispenser at 50% ",__FILE__,DispenserId,(int)IDS_Dispenser_Data[DispenserId].consumedinnanolitter,RpWarning,(int)65000000,0);
         }
-        if ((Dispenser_Id_to_LS_25_Id[DispenserId])&&(DispenserDirectionFlag_25[DispenserId]==false))
+        if ((Dispenser_Id_to_LS_25_Id[DispenserId] == LIMIT)&&(DispenserDirectionFlag_25[DispenserId]==false))
         {
             DispenserDirectionFlag_25[DispenserId]= true;
             ReportWithPackageFilter(IDSFilter,"Dispenser at 25% ",__FILE__,DispenserId,(int)IDS_Dispenser_Data[DispenserId].consumedinnanolitter,RpWarning,(int)32500000,0);
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 504b3bb0c..97c37cc4f 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -623,7 +623,8 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
 #ifdef DISPENSER_PBU_PRE_RUN
              if ((pressure>3.0)&&(DispenserPBUReady[i]==false))
              {
-                 Control3WayValvesWithCallback ((Valves_t)i, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
+                 Control3WayValvesWithCallback ((Valves_t)i, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
+                 ReportWithPackageFilter(IDSFilter,"Opening Dispenser valve for PBU",__FILE__,__LINE__,i,RpWarning,(int)(pressure*100),0);
                  DispenserPBUReady[i] = true;
              }
 #endif
@@ -654,6 +655,8 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
                          {
                              NumofReadyDispensers++;
                              DispenserReady[i] = true;
+                             ReportWithPackageFilter(IDSFilter,"Dispenser ready  PBU",__FILE__,__LINE__,i,RpWarning,(int)NumofReadyDispensers,0);
+
                          }
 #else
                          NumofReadyDispensers++;
@@ -957,6 +960,7 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
              if (pressure<3.0)
              {
                  Control3WayValvesWithCallback ((Valves_t)i, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
+                 ReportWithPackageFilter(IDSFilter,"Closing Dispenser valve for PBU",__FILE__,__LINE__,i,RpWarning,(int)(pressure*100),0);
                  DispenserPBUReady[i] = false;
              }
              else
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
index 06dac8fdc..7f1b9ffb5 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
@@ -783,14 +783,13 @@ uint32_t PowerUpUpdate(MACHINE_STATE_STAGES_ENUM stage)
         case MACHINE_STATE_BUILT_IN_FAILED:
             response.state = POWER_UP_STATE__BuiltInTest;
             response.progresspercentage = 15.0;
-            response.message = "Built In Test";
+            response.message = "Built In Test failed";
+            Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED;
             break;
         case MACHINE_STATE_BUILT_IN_TEST:
             response.state = POWER_UP_STATE__BuiltInTest;
             response.progresspercentage = 15.0;
             response.message = "Built In Test";
-            //response.message = "Built In Test failed";
-            //Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED;
             break;
         case MACHINE_STATE_INITIAL_BLOWER_ACTIVATION:
             response.state = POWER_UP_STATE__InitialBlowerActivation;
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index 9f5151117..ab246dbc3 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -1197,10 +1197,10 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes
         if ((heaterRatio>0.99)&&(dispenserRatio>0.99))
         {
             wfcf_count+=1.00;
-            Report("prepare_progress wfcf" ,__FILE__,(int)(wfcf_count),(int)(heaterRatio*100),RpWarning,(int)(dispenserRatio*100),0);
+            //Report("prepare_progress wfcf" ,__FILE__,(int)(wfcf_count),(int)(heaterRatio*100),RpWarning,(int)(dispenserRatio*100),0);
         }
         prepare_progress = (0.9*heaterRatio)+(0.08*dispenserRatio) + (0.02*wfcf_count/25.0);
-        Report("prepare_progress" ,__FILE__,(int)(prepare_progress*1000),(int)(heaterRatio*1000),RpWarning,(int)(dispenserRatio*1000),0);
+        //Report("prepare_progress" ,__FILE__,(int)(prepare_progress*1000),(int)(heaterRatio*1000),RpWarning,(int)(dispenserRatio*1000),0);
     }
     else
         wfcf_count = 0;