diff --git a/src/TcoCore/src/TcoCore.Wpf/TcoComponent/TcoComponentServiceView.xaml b/src/TcoCore/src/TcoCore.Wpf/TcoComponent/TcoComponentServiceView.xaml index 59ba553e2..5d059c3a5 100644 --- a/src/TcoCore/src/TcoCore.Wpf/TcoComponent/TcoComponentServiceView.xaml +++ b/src/TcoCore/src/TcoCore.Wpf/TcoComponent/TcoComponentServiceView.xaml @@ -76,7 +76,8 @@ - + diff --git a/src/TcoCore/src/TcoCoreConnector/pex/TcoComponent/TcoComponent.cs b/src/TcoCore/src/TcoCoreConnector/pex/TcoComponent/TcoComponent.cs index f9e2f56d8..29b12ece3 100644 --- a/src/TcoCore/src/TcoCoreConnector/pex/TcoComponent/TcoComponent.cs +++ b/src/TcoCore/src/TcoCoreConnector/pex/TcoComponent/TcoComponent.cs @@ -46,7 +46,10 @@ public bool HasComponents get { return Components.Count()>0; } } - + public bool HasTask + { + get { return Tasks.Count() > 0; } + } public object StatusControl { diff --git a/src/TcoPneumatics/src/XaeTcoPneumatics/TcoPneumatics/POUs/Cylinders/TcoCylinder.TcPOU b/src/TcoPneumatics/src/XaeTcoPneumatics/TcoPneumatics/POUs/Cylinders/TcoCylinder.TcPOU index 99e79e7e5..bd4573f7e 100644 --- a/src/TcoPneumatics/src/XaeTcoPneumatics/TcoPneumatics/POUs/Cylinders/TcoCylinder.TcPOU +++ b/src/TcoPneumatics/src/XaeTcoPneumatics/TcoPneumatics/POUs/Cylinders/TcoCylinder.TcPOU @@ -15,6 +15,10 @@ VAR increment: INT; _suspendedHome:BOOL; _suspendedWork:BOOL; + {attribute 'hide'} + _suspendedHomeCounter:INT; + {attribute 'hide'} + _suspendedWorkCounter:INT; END_VAR VAR _config : TcoCylinderConfig; @@ -23,6 +27,8 @@ VAR END_VAR]]> '); END_IF; @@ -309,7 +315,10 @@ VAR _signalInfo : TcoSignalInfo; END_VAR]]> - 0; IF (_toHomePos OR _moveHomeDefault.Busy) AND inoDisableCondition THEN _signalInfo.GetSignalInfo(SIZEOF(inoDisableCondition), ADR(inoDisableCondition)); @@ -328,7 +337,10 @@ VAR_INPUT END_VAR ]]> - 0; IF (_toHomePos OR _moveHomeDefault.Busy) AND inDisableCondition THEN Messenger.Warning(CONCAT('<#Movement suspended due to#> : ' , inMessage)); @@ -366,7 +378,10 @@ VAR _signalInfo : TcoSignalInfo; END_VAR]]> - 0; IF (_toHomePos OR _moveHomeDefault.Busy) AND not inoDisableCondition THEN _signalInfo.GetSignalInfo(SIZEOF(inoDisableCondition), ADR(inoDisableCondition)); @@ -405,7 +420,11 @@ VAR _signalInfo : TcoSignalInfo; END_VAR]]> - 0; + IF (_toWorkPos OR _moveWorkDefault.Busy) AND inoDisableCondition THEN _signalInfo.GetSignalInfo(SIZEOF(inoDisableCondition), ADR(inoDisableCondition)); Messenger.Warning(CONCAT('<#Movement suspended due to#> : ' , _signalInfo.SymbolPath)); @@ -423,7 +442,10 @@ VAR_INPUT END_VAR ]]> - 0; IF (_toWorkPos OR _moveWorkDefault.Busy) AND inDisableCondition THEN Messenger.Warning(CONCAT('<#Movement suspended due to#> : ', inMessage)); @@ -463,7 +485,10 @@ VAR _signalInfo : TcoSignalInfo; END_VAR]]> - 0; IF (_toWorkPos OR _moveWorkDefault.Busy) AND not inoDisableCondition THEN _signalInfo.GetSignalInfo(SIZEOF(inoDisableCondition), ADR(inoDisableCondition)); diff --git a/src/TcoPneumatics/src/XaeTcoPneumatics/TcoPneumatics/POUs/Cylinders/TcoDoubleCylinder.TcPOU b/src/TcoPneumatics/src/XaeTcoPneumatics/TcoPneumatics/POUs/Cylinders/TcoDoubleCylinder.TcPOU index 2c431a033..82e6e819f 100644 --- a/src/TcoPneumatics/src/XaeTcoPneumatics/TcoPneumatics/POUs/Cylinders/TcoDoubleCylinder.TcPOU +++ b/src/TcoPneumatics/src/XaeTcoPneumatics/TcoPneumatics/POUs/Cylinders/TcoDoubleCylinder.TcPOU @@ -15,7 +15,10 @@ VAR increment : INT; _suspendedHome : BOOL; _suspendedWork : BOOL; - + {attribute 'hide'} + _suspendedHomeCounter:INT; + {attribute 'hide'} + _suspendedWorkCounter:INT; END_VAR VAR _config : TcoCylinderConfig; @@ -24,7 +27,8 @@ VAR END_VAR]]> '); END_IF; @@ -308,7 +312,10 @@ VAR _signalInfo : TcoSignalInfo; END_VAR]]> - 0; IF (_toHomePos OR _moveHomeDefault.Busy) AND inoDisableCondition THEN _signalInfo.GetSignalInfo(SIZEOF(inoDisableCondition), ADR(inoDisableCondition)); @@ -328,8 +335,10 @@ VAR_INPUT END_VAR ]]> - 0; IF (_toHomePos OR _moveHomeDefault.Busy) AND inDisableCondition THEN Messenger.Warning(CONCAT('<#Movement suspended due to#> : ', inMessage)); _toHomePos := FALSE; @@ -369,7 +378,10 @@ VAR _signalInfo : TcoSignalInfo; END_VAR]]> - 0; IF (_toHomePos OR _moveHomeDefault.Busy) AND NOT inoDisableCondition THEN _signalInfo.GetSignalInfo(SIZEOF(inoDisableCondition), ADR(inoDisableCondition)); @@ -411,7 +423,10 @@ VAR _signalInfo : TcoSignalInfo; END_VAR]]> - 0; IF (_toWorkPos OR _moveWorkDefault.Busy) AND inoDisableCondition THEN _signalInfo.GetSignalInfo(SIZEOF(inoDisableCondition), ADR(inoDisableCondition)); @@ -436,7 +451,10 @@ VAR inoDisableCondition: BOOL; END_VAR]]> - 0; IF (_toWorkPos OR _moveWorkDefault.Busy) AND inDisableCondition THEN Messenger.Warning(CONCAT('<#Movement suspended due to#> : ', inMessage)); @@ -477,7 +495,10 @@ VAR _signalInfo : TcoSignalInfo; END_VAR]]> - 0; IF (_toWorkPos OR _moveWorkDefault.Busy) AND NOT inoDisableCondition THEN _signalInfo.GetSignalInfo(SIZEOF(inoDisableCondition), ADR(inoDisableCondition));