prepare light colors - no actual change in code

2 files changed, 16 insertions, 5 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 4122955b3..11a48b587 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -545,7 +545,7 @@ void CopyTemperaturesToMonitor(void)
         headblowervoltage2 = HeadBlowersGetRPM(HEAD_FAN_LEFT);
         DiagnosticsMonitor.headblowervoltage1 = &headblowervoltage1;
         DiagnosticsMonitor.headblowervoltage2 = &headblowervoltage2;
-#warning machine to machine test
+//#warning machine to machine test
         DiagnosticsMonitor.headzone4temperature =
                 HeaterTemperature[HEATER_TYPE__HeaterZone4];
         DiagnosticsMonitor.headzone9temperature =
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 367b36e38..0d0726645 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -250,6 +250,7 @@ JobDescriptionFileBrushStop *FirstBrushStop = NULL;
          DispenserUsedInJob[Dispenser_i] = false;
      }
      n_segments = 0;
+#ifndef LIGHT_COLORS
      if (MotorsCfg[DispenserIdToMotorId[CLEANER_DISPENSER]].hardwaremotortype == DispenserIdToMotorId[CLEANER_DISPENSER])
      {
          DispenserUsedInJob[CLEANER_DISPENSER] = true;
@@ -260,7 +261,7 @@ JobDescriptionFileBrushStop *FirstBrushStop = NULL;
          DispenserUsedInJob[CLEANER_DISPENSER] = false;
          EnableCleaning = false;
      }
-
+#endif
      if (JobTicket->enablelubrication == true)
      {
          //DispenserUsedInJob[LUBRICANT_DISPENSER] = true;
@@ -616,6 +617,7 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
              else
                  DispenserReady[i] = true;
          }
+#ifndef LIGHT_COLORS
          pressure = GetDispenserPressure(CLEANER_DISPENSER);
          if (pressure > 0.02)
          {
@@ -625,7 +627,7 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
                  ReportWithPackageFilter(IDSFilter,"IDS stop cleaner",__FILE__,CLEANER_DISPENSER,(int)(pressure*100),RpWarning,(int)CurrentDispenserSpeed[CLEANER_DISPENSER] ,0);
              CurrentDispenserSpeed[CLEANER_DISPENSER] = 0;
          }
-
+#endif
          if ((NumofReadyDispensers)&&(DispenserBuildTimeCounter%1000 == 0))
          {
              ReportWithPackageFilter(IDSFilter,"IDS_Prepare_Callback",__FILE__,DispenserBuildTimeCounter,NumofReadyDispensers,RpWarning,(int)NumOfActiveDispensers,0);
@@ -761,6 +763,7 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
      //start new stage
      if (endOfPrepareWCF == true)
      {
+#ifndef LIGHT_COLORS
          if (CurrentDispenserSpeed[CLEANER_DISPENSER])
          {
              HW_Motor_Id = DispenserIdToMotorId[CLEANER_DISPENSER];
@@ -768,6 +771,7 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
              CurrentDispenserSpeed[CLEANER_DISPENSER] = 0;
              ReportWithPackageFilter(IDSFilter,"IDS stop cleaner",__FILE__,CLEANER_DISPENSER,(int)(pressure*100),RpWarning,(int)CurrentDispenserSpeed[CLEANER_DISPENSER] ,0);
          }
+#endif
          SafeRemoveControlCallback(DispenserPrepareControlId, IDS_Prepare_Callback );
          DispenserPrepareControlId = 0xFF;
          ReportWithPackageFilter(IDSFilter,"IDS_Prepare_Callback SafeRemoveControlCallback",__FILE__,DispenserBuildTimeCounter,NumofReadyDispensers,RpWarning,(int)NumOfActiveDispensers,0);
@@ -941,11 +945,12 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
                  }*/
              }
          }
+#ifndef LIGHT_COLORS
          TimerMotors_t  HW_Motor_Id = DispenserIdToMotorId[CLEANER_DISPENSER];
          MotorSetSpeed((TimerMotors_t)HW_Motor_Id,INITIAL_CLEANER_SPEED ); //set the dispenser to the
          CurrentDispenserSpeed[CLEANER_DISPENSER] = INITIAL_CLEANER_SPEED;
          ReportWithPackageFilter(IDSFilter,"IDS start cleaner",__FILE__,CLEANER_DISPENSER,(int)(GetDispenserPressure(CLEANER_DISPENSER)*100),RpWarning,(int)CurrentDispenserSpeed[CLEANER_DISPENSER] ,0);
-
+#endif
 
      }
      DispenserBuildTimeCounter = 0;
@@ -1176,8 +1181,10 @@ uint32_t IDS_Cleaning_Stop_Cleaning_Solution (callback_fptr callback);
          ReportWithPackageFilter(IDSFilter,"End of Pre-segment Handling",__FILE__,__LINE__,InterSegmentStepsCount,RpWarning,(int)lInterSegmentLength,0);
          //PreSegmentReady(Module_IDS,ModuleDone);
          SafeRemoveControlCallback(DispenserPreSegmentControlId,IDSPreSegmentStateCallbackRunner);
+#ifndef LIGHT_COLORS
          if (CurrentDispenserSpeed[CLEANER_DISPENSER]>0)
              IDS_Cleaning_Stop_Cleaning_Solution (NULL);
+#endif
          setRapidPressureRead(false);
          //if (JobEndSequence == true)
          //    DistanceToSpoolReady(Module_IDS,ModuleDone);
@@ -1718,8 +1725,10 @@ uint32_t IDSSegmentState(void *SegmentDetails, int SegmentId)
 #else
      Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Head);
 #endif
+#ifndef LIGHT_COLORS
      if (CurrentDispenserSpeed[CLEANER_DISPENSER]>0)
          IDS_Cleaning_Stop_Cleaning_Solution(NULL);
+#endif
      SegmentNumOfBrushStops = Segment->n_brushstops;
      BrushStopTime = Segment->length*1000/(double)SegmentNumOfBrushStops;  //brushstop in meters //brushstop in millisecond
      BrushStopTime = ((BrushStopTime*100)/dyeingspeed);//brushstop in seconds
@@ -1936,9 +1945,11 @@ uint32_t IDSSegmentState(void *SegmentDetails, int SegmentId)
          }
 
      }
+#ifndef LIGHT_COLORS
      if (CurrentDispenserSpeed[CLEANER_DISPENSER]>0)
          IDS_Cleaning_Stop_Cleaning_Solution(NULL);
-	IDS_StopLubrication();
+#endif
+     IDS_StopLubrication();
 	Init_CleaningStageCounter();//set the counter before relocating
 	HeadCard_Actuators_Relocate();
 	return OK;