Browse Source

update plating cell vertical post message

chenkui 1 week ago
parent
commit
46a2bcdea3

+ 3 - 3
PunkHPX8_RT/Modules/PlatingCell/PlatingCellDepositionRoutine.cs

@@ -113,7 +113,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
         {               //没有上电保护,此刻给电
             Runner.RunIf(RunRecipeStep.RunPowerStep, _recipe.IsEntryTypeCold, StartPowerStep, _delay_1ms)
                 //检验步阶电流是否完成
-                .WaitWithStopCondition(RunRecipeStep.RunPowerStepWait, CheckRecipeStepEndStatus, CheckRecipeStepStopStatus, false, _delay_1ms)
+                .WaitWithStopCondition(RunRecipeStep.RunPowerStepWait, CheckRecipeStepEndStatus, CheckRecipeStepStopStatus, false, _delay_10s)
                 .LoopStart(RunRecipeStep.LoopRotationStart, "Start rotation cycle",_recipe.DepStepCount,NullFun)
                 //vertical 调整位置(第一步不用调,entry过程已经走到位置了)
                 .LoopRunIf(RunRecipeStep.LoopVerticalGotoOffSet, _recipe.DepSteps[_depositionStepIndex].PlatingZoffset!=0 && _depositionStepIndex!=0, () => StartVertical("Plate", _recipe.DepSteps[_depositionStepIndex].PlatingZoffset),_delay_1ms)
@@ -251,8 +251,8 @@ namespace PunkHPX8_RT.Modules.PlatingCell
         /// <returns></returns>
         private bool StartVertical(string positionName, double offset)
         {
-            return _verticalEntity.CheckToPostMessage<PlatingCellVerticalState, PlatingCellVerticalEntity.VerticalMsg>(Aitex.Core.RT.Log.eEvent.INFO_PLATINGCELL,
-                    Module, (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset);
+            return _verticalEntity.CheckToPostMessage<PlatingCellVerticalState, PlatingCellVerticalEntity.VerticalMsg>(eEvent.INFO_PLATINGCELL,
+                    _verticalEntity.Module.ToString(), (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset);
         }
         /// <summary>
         /// 检验垂直电机是否运动完成

+ 1 - 1
PunkHPX8_RT/Modules/PlatingCell/PlatingCellDryRoutine.cs

@@ -113,7 +113,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
         private bool StartVertical(string positionName, double offset, int speed, int accelerate)
         {
             return _verticalEntity.CheckToPostMessage<PlatingCellVerticalState, PlatingCellVerticalEntity.VerticalMsg>(Aitex.Core.RT.Log.eEvent.INFO_PLATINGCELL,
-                    Module, (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset, speed, accelerate);
+                    _verticalEntity.Module.ToString(), (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset, speed, accelerate);
         }
         /// <summary>
         /// 检验垂直电机是否运动完成

+ 1 - 1
PunkHPX8_RT/Modules/PlatingCell/PlatingCellEntryRoutine.cs

@@ -185,7 +185,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
         private bool StartVertical(string positionName, double offset)
         {
             return _verticalEntity.CheckToPostMessage<PlatingCellVerticalState, PlatingCellVerticalEntity.VerticalMsg>(Aitex.Core.RT.Log.eEvent.INFO_PLATINGCELL,
-                    Module, (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset);
+                    _verticalEntity.Module.ToString(), (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset);
         }
         
         /// <summary>

+ 1 - 1
PunkHPX8_RT/Modules/PlatingCell/PlatingCellInterRinseRoutine.cs

@@ -114,7 +114,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
         private bool StartVertical(string positionName, double offset)
         {
             return _verticalEntity.CheckToPostMessage<PlatingCellVerticalState, PlatingCellVerticalEntity.VerticalMsg>(Aitex.Core.RT.Log.eEvent.INFO_PLATINGCELL,
-                    Module, (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName,  offset);
+                    _verticalEntity.Module.ToString(), (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName,  offset);
         }
         /// <summary>
         /// 检验垂直电机是否运动完成

+ 2 - 2
PunkHPX8_RT/Modules/PlatingCell/PlatingCellReclaimRoutine.cs

@@ -139,8 +139,8 @@ namespace PunkHPX8_RT.Modules.PlatingCell
         /// <returns></returns>
         private bool StartVertical(string positionName, double offset,int speed,int accelerate)
         {
-            return _verticalEntity.CheckToPostMessage<PlatingCellVerticalState, PlatingCellVerticalEntity.VerticalMsg>(Aitex.Core.RT.Log.eEvent.INFO_PLATINGCELL,
-                    Module, (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset, speed, accelerate);
+            return _verticalEntity.CheckToPostMessage<PlatingCellVerticalState, PlatingCellVerticalEntity.VerticalMsg>(eEvent.INFO_PLATINGCELL,
+                    _verticalEntity.Module.ToString(), (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset, speed, accelerate);
         }
         /// <summary>
         /// 检验垂直电机是否运动完成

+ 1 - 1
PunkHPX8_RT/Modules/PlatingCell/PlatingCellRinseRoutine.cs

@@ -99,7 +99,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
         private bool StartVertical(string positionName, double offset, int speed, int accelerate)
         {
             return _verticalEntity.CheckToPostMessage<PlatingCellVerticalState, PlatingCellVerticalEntity.VerticalMsg>(Aitex.Core.RT.Log.eEvent.INFO_PLATINGCELL,
-                    Module, (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset, speed, accelerate);
+                    _verticalEntity.Module.ToString(), (int)PlatingCellVerticalEntity.VerticalMsg.Position, positionName, offset, speed, accelerate);
         }
         /// <summary>
         /// 检验垂直电机是否运动完成

+ 4 - 8
PunkHPX8_RT/Modules/PlatingCell/PlatingCellRunRecipeRoutine.cs

@@ -197,18 +197,15 @@ namespace PunkHPX8_RT.Modules.PlatingCell
                         () => CommonFunction.CheckRoutineStopState(_interRinseRoutine))
                 //entry
                 .LoopRun(RunRecipeStep.Entry,  () => { return _entryRoutine.Start(_recipe, LARGETARGETPOSITION, _powerSupplierStepPeriodDatas) == RState.Running; })
-                .LoopRunWithStopStatus(RunRecipeStep.CheckEntry, CheckEntryEndStatus,
-                        () => CommonFunction.CheckRoutineStopState(_entryRoutine))
+                .LoopRunWithStopStatus(RunRecipeStep.CheckEntry, CheckEntryEndStatus, () => CommonFunction.CheckRoutineStopState(_entryRoutine))
 
                 //Deposition
                 .LoopRun(RunRecipeStep.Deposition, () => { return _depositionRoutine.Start(_recipe, _isZeroCurrent,_powerSupplierStepPeriodDatas) == RState.Running; })
-                .LoopRunWithStopStatus(RunRecipeStep.CheckDeposition, CheckDepositionEndStatus,
-                        () => CommonFunction.CheckRoutineStopState(_depositionRoutine))
+                .LoopRunWithStopStatus(RunRecipeStep.CheckDeposition, CheckDepositionEndStatus,() => CommonFunction.CheckRoutineStopState(_depositionRoutine))
 
                  //Reclaim
                 .LoopRun(RunRecipeStep.Reclaim, () => { return _reclaimRoutine.Start(_recipe, _isZeroCurrent,_device.PowerSupplier) == RState.Running; })
-                .LoopRunWithStopStatus(RunRecipeStep.CheckReclaim, CheckReclaimEndStatus,
-                        () => CommonFunction.CheckRoutineStopState(_reclaimRoutine))
+                .LoopRunWithStopStatus(RunRecipeStep.CheckReclaim, CheckReclaimEndStatus, () => CommonFunction.CheckRoutineStopState(_reclaimRoutine))
 
                 //Rinse
                 .LoopRun(RunRecipeStep.Rinse, () => { return _rinseRoutine.Start(_recipe) == RState.Running; })
@@ -217,8 +214,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
 
                 //Dry
                 .LoopRun(RunRecipeStep.Dry, () => { return _dryRoutine.Start(_recipe) == RState.Running; })
-                .LoopRunWithStopStatus(RunRecipeStep.CheckDry, CheckDryEndStatus,
-                        () => CommonFunction.CheckRoutineStopState(_dryRoutine))
+                .LoopRunWithStopStatus(RunRecipeStep.CheckDry, CheckDryEndStatus, () => CommonFunction.CheckRoutineStopState(_dryRoutine))
                 .LoopEnd(RunRecipeStep.LoopEnd, UpdateCycleCount, _delay_1ms)
                 .End(RunRecipeStep.End, NullFun);
             return Runner.Status;