diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj b/templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj index 021fc1b..0c84809 100644 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj @@ -1,20 +1,6 @@ - + - - TcoAmsNetId - 48 - - netId - BYTE - - 0 - 6 - - 48 - 0 - - ARRAY [0..31] OF USINT 256 @@ -44,6 +30,20 @@ 48 + + TcoAmsNetId + 48 + + netId + BYTE + + 0 + 6 + + 48 + 0 + + ARRAY [0..0] OF BIT 1 @@ -151,55 +151,11 @@ - + x_template_xPlc Instance {08500001-0000-0000-F000-000000000064} PlcTask Inputs - - MAIN._technology.Device_1.Inputs.SlaveCount - UINT - - - MAIN._technology.Device_1.Inputs.DevState - UINT - - - MAIN._technology.Device_1.Inputs.Frm0State - UINT - - - MAIN._technology.Device_1.Inputs.Frm0WcState - UINT - - - MAIN._technology.Device_1.Inputs.Frm0InputToggle - UINT - - - MAIN._technology.Device_1.InfoData.ChangeCount - UINT - - - MAIN._technology.Device_1.InfoData.DevId - UINT - - - MAIN._technology.Device_1.InfoData.AmsNetId - TcoAmsNetId - - - MAIN._technology.Device_1.InfoData.CfgSlaveCount - UINT - - - MAIN._technology.Device_1.InfoData.DcToTcTimeOffset - LINT - - - MAIN._technology.Device_1.InfoData.DcToExtTimeOffset - LINT - GVL_iXlinker.EC.EC.EK.InfoData.State UINT @@ -692,41 +648,53 @@ GVL_iXlinker.EC.InfoData.DcToExtTimeOffset LINT - - - PlcTask Outputs - MAIN._technology._cu00x._components.Cam._status.SignalStatus.EnableResultsBuffering - BOOL + MAIN._technology.Device_1.Inputs.SlaveCount + UINT - MAIN._technology._cu00x._components.Cam._status.SignalStatus.AcknowledgeInspectionResults - BOOL + MAIN._technology.Device_1.Inputs.DevState + UINT - MAIN._technology._cu00x._components.Cam._status.SignalStatus.ExtendedUserDataSet - BOOL + MAIN._technology.Device_1.Inputs.Frm0State + UINT - MAIN._technology._cu00x._components.Cam._status.SignalStatus.ExecuteCommand - BOOL + MAIN._technology.Device_1.Inputs.Frm0WcState + UINT - MAIN._technology._cu00x._components.Cam._status.SignalStatus.ClearError - BOOL + MAIN._technology.Device_1.Inputs.Frm0InputToggle + UINT - MAIN._technology.Device_1.Outputs.DevCtrl + MAIN._technology.Device_1.InfoData.ChangeCount UINT - MAIN._technology.Device_1.Outputs.Frm0Ctrl + MAIN._technology.Device_1.InfoData.DevId UINT - MAIN._technology.Device_1.Outputs.Frm0WcCtrl + MAIN._technology.Device_1.InfoData.AmsNetId + TcoAmsNetId + + + MAIN._technology.Device_1.InfoData.CfgSlaveCount UINT + + MAIN._technology.Device_1.InfoData.DcToTcTimeOffset + LINT + + + MAIN._technology.Device_1.InfoData.DcToExtTimeOffset + LINT + + + + PlcTask Outputs GVL_iXlinker.EC.EC.EK.PNEU.Modules.Outputs.digital_Data_O ARRAY [0..31] OF USINT @@ -823,6 +791,38 @@ GVL_iXlinker.EC.Outputs.Frm0WcCtrl UINT + + MAIN._technology._cu00x._components.Cam._status.SignalStatus.EnableResultsBuffering + BOOL + + + MAIN._technology._cu00x._components.Cam._status.SignalStatus.AcknowledgeInspectionResults + BOOL + + + MAIN._technology._cu00x._components.Cam._status.SignalStatus.ExtendedUserDataSet + BOOL + + + MAIN._technology._cu00x._components.Cam._status.SignalStatus.ExecuteCommand + BOOL + + + MAIN._technology._cu00x._components.Cam._status.SignalStatus.ClearError + BOOL + + + MAIN._technology.Device_1.Outputs.DevCtrl + UINT + + + MAIN._technology.Device_1.Outputs.Frm0Ctrl + UINT + + + MAIN._technology.Device_1.Outputs.Frm0WcCtrl + UINT + @@ -833,7 +833,7 @@ - 0 + 0 PlcTask #x02010030 diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/Icon.TcDUT b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/Icon.TcDUT new file mode 100644 index 0000000..947c667 --- /dev/null +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/Icon.TcDUT @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/NotificationPanel.TcPOU b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/NotificationPanel.TcPOU index 41a7d9e..6678675 100644 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/NotificationPanel.TcPOU +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/NotificationPanel.TcPOU @@ -12,16 +12,8 @@ VAR_INPUT ~*) inBlinkPeriod:TIME; - (*~ - - - Source inputs for signalisation. - - - ~*) - inSignalSource:NotificationPanelInfo; - END_VAR + VAR {attribute addProperty Name "<#Heart beat#>"} _heartBeat : BOOL; @@ -31,28 +23,33 @@ VAR {attribute clr [RenderIgnore()]} _toggle: TcoUtilities.TcoBlinker(THIS^); - - _notificationPanelSignals: NotificationPanelInfo; + + _iconSet: ARRAY[0..20] OF Icon; //ak potrebujes zobrazit viac ikon, uprav velkost pola + + _iconSetClear : ARRAY[0..20] OF Icon; //ak potrebujes zobrazit viac ikon, uprav velkost pola + + _iconPlcPulse : Icon; + + _iconParamsClear : Icon; + END_VAR ]]> - '; +_iconPlcPulse.IconType := TO_STRING(eIconType.plcConnection); +_iconPlcPulse.Signal := _heartBeat; +_iconPlcPulse.DisableRedIcon := TRUE; +addIcon(_iconPlcPulse); + +//setIconsStyle(); + +Blink(); +CountSignals(); -_badgeValue := 0; -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.ControlVoltage); -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.AirPressure); -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.AutomatAllowed); -_badgeValue:=_badgeValue + BOOL_TO_INT(_notificationPanelSignals.EmergencyStop); -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.SafetyDoorOk); -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.DoorClosed); -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.Doorlocked); -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.LightCurtain); -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.ProcessDataOk); -_badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.TechnologyDataOk); @@ -61,5 +58,175 @@ _badgeValue:=_badgeValue + BOOL_TO_INT(NOT _notificationPanelSignals.TechnologyD ]]> + + + + + + + + + + + + + + + + + + + + + + '' AND NOT _iconSet[_iconIndex].DisableRedIcon THEN + _badgeValue := _badgeValue + BOOL_TO_INT(NOT _iconSet[_iconIndex].Signal); + END_IF +END_FOR +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/NotificationPanelInfo.TcDUT b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/NotificationPanelInfo.TcDUT deleted file mode 100644 index e0392d9..0000000 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/NotificationPanelInfo.TcDUT +++ /dev/null @@ -1,30 +0,0 @@ - - - - "} - ControlVoltage : BOOL; - {attribute addProperty Name "<#Air pressure#>"} - AirPressure : BOOL; - {attribute addProperty Name "<#Autmatic mode allowed#>"} - AutomatAllowed : BOOL; - {attribute addProperty Name "<#Emergency stop#>"} - EmergencyStop : BOOL; - {attribute addProperty Name "<#Safety doors OK#>"} - SafetyDoorOk : BOOL; - {attribute addProperty Name "<#Doors closed#>"} - DoorClosed : BOOL; - {attribute addProperty Name "<#Doors locked#>"} - DoorLocked : BOOL; - {attribute addProperty Name "<#Light curtain#>"} - LightCurtain : BOOL; - {attribute addProperty Name "<#Process data#>"} - ProcessDataOk : BOOL; - {attribute addProperty Name "<#Technology data#>"} - TechnologyDataOk : BOOL; -END_STRUCT -END_TYPE -]]> - - \ No newline at end of file diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/eIconType.TcDUT b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/eIconType.TcDUT new file mode 100644 index 0000000..af21c4d --- /dev/null +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Abstractions/Generic/NotificationPanel/eIconType.TcDUT @@ -0,0 +1,27 @@ + + + + + + \ No newline at end of file diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/CU00x.TcPOU b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/CU00x.TcPOU index 5f750ad..ee76f91 100644 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/CU00x.TcPOU +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/CU00x.TcPOU @@ -30,7 +30,7 @@ VAR {attribute addProperty Name "<#Test multi positions#>"} _positionsMulti : CU00xTestMultiPositions(THIS^); - + _notificationPanel : NotificationPanel(THIS^); END_VAR ]]> @@ -395,6 +395,9 @@ GVL_iXlinker.Ec.EC.Ek.PNEU.Modules.Outputs.digital_Data_O[2].2:=tempBoolWork; Components.PlsPaletizator(inSafeCondition:=GVL_iXlinker.Ec.EC.IA1.Channel_1.Input); Components.PlsPaletizator.Service(); +setupIcons(); +_notificationPanel(inBlinkPeriod:=T#500MS); + ]]> @@ -470,6 +473,95 @@ END_VAR + + + + '; +_iconParams.IconType := TO_STRING(eIconType.controlVoltage);//'Power'; +_iconParams.Signal := TRUE; +_iconParams.BlinkEnabled := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + + +_iconParams.Title := '<#Air Pressure#>'; +_iconParams.IconType := TO_STRING(eIconType.airPressure);//'OxygenTank'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +_iconParams.Title := '<#Emergency stop#>'; +_iconParams.IconType := TO_STRING(eIconType.emergencyStop);//'Alert'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +_iconParams.Title := '<#Safety door OK#>'; +_iconParams.IconType := TO_STRING(eIconType.safetyDoor);//'ShieldCheck'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +_iconParams.Title := '<#Door closed#>'; +_iconParams.IconType := TO_STRING(eIconType.doorClosed);//'Door'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +_iconParams.Title := '<#Door locked#>'; +_iconParams.IconType := TO_STRING(eIconType.doorLocked);//'DoorClosedLock'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +_iconParams.Title := '<#Automat allowed#>'; +_iconParams.IconType := TO_STRING(eIconType.automatAllowed);//'RunFast'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +_iconParams.Title := '<#Process data loaded#>'; +_iconParams.IconType := TO_STRING(eIconType.processDataLoaded);//'ClipboardCheckOutline'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +_iconParams.Title := '<#Technology data loaded#>'; +_iconParams.IconType := TO_STRING(eIconType.technologyDataLoaded);//'CogOutline'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +_iconParams.Title := '<#Light barrier#>'; +_iconParams.IconType := TO_STRING(eIconType.opticBarrier);//'Hand'; +_iconParams.Signal := TRUE; +_NotificationPanel.addIcon(_iconParams); +_iconParams := _notificationPanel._iconParamsClear; + +//_iconParams.Title := '<#Printer#>'; +//_iconParams.IconType := 'Printer'; +//_iconParams.Signal := TRUE; +//_NotificationPanel.addIcon(_iconParams); +//_iconParams := _notificationPanel._iconParamsClear; + +//_iconParams.Title := '<#Traceability#>'; +//_iconParams.IconType := 'Database'; +//_iconParams.Signal := FALSE; +//_iconParams.EnableRedIcon := TRUE; +//_iconParams.AlertEnabled := TRUE; +//_NotificationPanel.addIcon(_iconParams); +//_iconParams := _notificationPanel._iconParamsClear; + + +]]> + + @@ -506,5 +598,100 @@ END_IF]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/Technology.TcPOU b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/Technology.TcPOU index b2affc1..a2eabb8 100644 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/Technology.TcPOU +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/Technology.TcPOU @@ -225,7 +225,7 @@ _components.Zone.AddKeyNormalService(inKeyNormalService:=_components.NormalServi ~*) METHOD PROTECTED Main VAR - _notificationSourceSignals: NotificationPanelInfo; +// _notificationSourceSignals: NotificationPanelInfo; safetyCircuitOk: BOOL; _eStopActive: BOOL; _keysAto: BOOL; @@ -287,21 +287,7 @@ _closed:=TRUE; _keysAto := TRUE; _eStopActive:=0; - -_notificationSourceSignals.ControlVoltage := TRUE;//Components.ControlVoltage.Signal.Signal -_notificationSourceSignals.AirPressure := TRUE;//Components.AirPressureOk.Signal.Signal, -_notificationSourceSignals.AutomatAllowed := _keysAto; -_notificationSourceSignals.EmergencyStop := _eStopActive > 0; -_notificationSourceSignals.SafetyDoorOk :=safetyCircuitOk; -_notificationSourceSignals.LightCurtain := TRUE; // not used -_notificationSourceSignals.DoorClosed := _closed; -_notificationSourceSignals.DoorLocked := _locked; -_notificationSourceSignals.ProcessDataOk := _processSettings._data._EntityId <> ''; -_notificationSourceSignals.TechnologyDataOk := _technologySettings._data._EntityId <> ''; - -_notificationPanel(inBlinkPeriod:=T#500MS , inSignalSource:=_notificationSourceSignals ); - - Context.Environment.Messaging.Resume(); +Context.Environment.Messaging.Resume(); (* @@ -379,5 +365,56 @@ END_VAR + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj index bc739cc..c991b80 100644 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj @@ -137,10 +137,13 @@ Code - + + Code + + Code - + Code @@ -389,8 +392,8 @@ - + diff --git a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Converters/BoolToCollapsedConverter.cs b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Converters/BoolToCollapsedConverter.cs new file mode 100644 index 0000000..5fb4a5d --- /dev/null +++ b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Converters/BoolToCollapsedConverter.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Markup; +using System.Windows; + +namespace x_template_xPlc +{ + public class BoolToCollapsedConverter : MarkupExtension, IValueConverter + { + public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + if ((bool)value) + { + return Visibility.Visible; + } + return Visibility.Collapsed; + } + public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + throw new NotImplementedException(); + } + + public override object ProvideValue(IServiceProvider serviceProvider) + { + return this; + } + + } +} diff --git a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Converters/NotificationPanelConverter.cs b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Converters/NotificationPanelConverter.cs new file mode 100644 index 0000000..ca12ff6 --- /dev/null +++ b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Converters/NotificationPanelConverter.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Data; +using System.Windows.Markup; + +namespace x_template_xPlc +{ + public class AlertToBrushConverter : MarkupExtension, IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + + if ((bool)value) + { + return Application.Current.Resources["Primary"]; + } + return Application.Current.Resources["Alert"]; + } + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + + public override object ProvideValue(IServiceProvider serviceProvider) + { + return this; + } + } + + public class IconConverter : MarkupExtension, IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value != null) + { + switch (value) + { + case "controlVoltage": return "Power"; + case "airPressure": return "OxygenTank"; + case "emergencyStop": return "Alert"; + case "safetyDoor": return "ShieldCheck"; + case "doorClosed": return "Door"; + case "doorLocked": return "DoorClosedLock"; + case "processDataLoaded": return "CogOutline"; + case "technologyDataLoaded": return "ClipboardCheckOutline"; + case "opticBarrier": return "Hand"; + case "robot": return "RobotIndustrial"; + case "plcConnection": return "HeartPulse"; + case "automatAllowed": return "RunFast"; + case "none": return "BorderNoneVariant"; + //default: return value.ToString(); + } + } + return value.ToString(); + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is null) + { + throw new ArgumentNullException(nameof(value)); + } + + throw new NotImplementedException(); + } + + public override object ProvideValue(IServiceProvider serviceProvider) + { + return this; + } + + } + + public class TitleToVisibilityCollapsedConverter : MarkupExtension, IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (string.IsNullOrEmpty(value?.ToString())) + { + return Visibility.Collapsed; + + } + return Visibility.Visible; + } + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + + public override object ProvideValue(IServiceProvider serviceProvider) + { + return this; + } + } + + +} diff --git a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/Generic/NotificationPanel/fbNotificationPanelView.xaml b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/Generic/NotificationPanel/fbNotificationPanelView.xaml index 72ce613..85e4614 100644 --- a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/Generic/NotificationPanel/fbNotificationPanelView.xaml +++ b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/Generic/NotificationPanel/fbNotificationPanelView.xaml @@ -17,23 +17,84 @@ + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + - - + + - - - - - - - + + + + + - - - - - + - - + + + + + + + - - - - - - - - - - - - + + + - - + + + + + - - - - - + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + \ No newline at end of file diff --git a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/MainView/MainView.xaml b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/MainView/MainView.xaml index ef39630..bb919e2 100644 --- a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/MainView/MainView.xaml +++ b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/MainView/MainView.xaml @@ -25,9 +25,9 @@ - - - + + + diff --git a/templates/mts-s-template/t/src/x_template_xOp/Views/MainView/MainView.xaml b/templates/mts-s-template/t/src/x_template_xOp/Views/MainView/MainView.xaml index 0f3c869..d867065 100644 --- a/templates/mts-s-template/t/src/x_template_xOp/Views/MainView/MainView.xaml +++ b/templates/mts-s-template/t/src/x_template_xOp/Views/MainView/MainView.xaml @@ -25,9 +25,9 @@ - - - + + + diff --git a/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.Designer.cs b/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.Designer.cs index 2a61a84..031a2ed 100644 --- a/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.Designer.cs +++ b/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.Designer.cs @@ -108,11 +108,11 @@ public static string ___Adding_Tag__ { } /// - /// Looks up a localized string similar to Air pressure. + /// Looks up a localized string similar to Air Pressure. /// - public static string ___Air_pressure__ { + public static string ___Air_Pressure__ { get { - return ResourceManager.GetString("___Air_pressure__", resourceCulture); + return ResourceManager.GetString("___Air_Pressure__", resourceCulture); } } @@ -269,15 +269,6 @@ public static string ___Assigned_Value__ { } } - /// - /// Looks up a localized string similar to Autmatic mode allowed. - /// - public static string ___Autmatic_mode_allowed__ { - get { - return ResourceManager.GetString("___Autmatic_mode_allowed__", resourceCulture); - } - } - /// /// Looks up a localized string similar to Auto. /// @@ -305,6 +296,15 @@ public static string ___AUTOMAT_ALL__ { } } + /// + /// Looks up a localized string similar to Automat allowed. + /// + public static string ___Automat_allowed__ { + get { + return ResourceManager.GetString("___Automat_allowed__", resourceCulture); + } + } + /// /// Looks up a localized string similar to Automat mode has been done.. /// @@ -604,11 +604,11 @@ public static string ___Control_panel__ { } /// - /// Looks up a localized string similar to Control voltage. + /// Looks up a localized string similar to Control Voltage. /// - public static string ___Control_voltage__ { + public static string ___Control_Voltage__ { get { - return ResourceManager.GetString("___Control_voltage__", resourceCulture); + return ResourceManager.GetString("___Control_Voltage__", resourceCulture); } } @@ -667,20 +667,20 @@ public static string ___Door_circuit__ { } /// - /// Looks up a localized string similar to Doors closed. + /// Looks up a localized string similar to Door closed. /// - public static string ___Doors_closed__ { + public static string ___Door_closed__ { get { - return ResourceManager.GetString("___Doors_closed__", resourceCulture); + return ResourceManager.GetString("___Door_closed__", resourceCulture); } } /// - /// Looks up a localized string similar to Doors locked. + /// Looks up a localized string similar to Door locked. /// - public static string ___Doors_locked__ { + public static string ___Door_locked__ { get { - return ResourceManager.GetString("___Doors_locked__", resourceCulture); + return ResourceManager.GetString("___Door_locked__", resourceCulture); } } @@ -1135,11 +1135,11 @@ public static string ___Last_station__ { } /// - /// Looks up a localized string similar to Light curtain. + /// Looks up a localized string similar to Light barrier. /// - public static string ___Light_curtain__ { + public static string ___Light_barrier__ { get { - return ResourceManager.GetString("___Light_curtain__", resourceCulture); + return ResourceManager.GetString("___Light_barrier__", resourceCulture); } } @@ -1469,6 +1469,15 @@ public static string ___Place__Position__ { } } + /// + /// Looks up a localized string similar to PLC connection. + /// + public static string ___PLC_connection__ { + get { + return ResourceManager.GetString("___PLC_connection__", resourceCulture); + } + } + /// /// Looks up a localized string similar to Please acknowledge recurring failure!. /// @@ -1550,6 +1559,15 @@ public static string ___Presure_OK__ { } } + /// + /// Looks up a localized string similar to Printer. + /// + public static string ___Printer__ { + get { + return ResourceManager.GetString("___Printer__", resourceCulture); + } + } + /// /// Looks up a localized string similar to Prisun vstupneho blistra. /// @@ -1587,11 +1605,11 @@ public static string ___Pritomnost_medzery_medzi_blistrami__ { } /// - /// Looks up a localized string similar to Process data. + /// Looks up a localized string similar to Process data loaded. /// - public static string ___Process_data__ { + public static string ___Process_data_loaded__ { get { - return ResourceManager.GetString("___Process_data__", resourceCulture); + return ResourceManager.GetString("___Process_data_loaded__", resourceCulture); } } @@ -1812,11 +1830,11 @@ public static string ___ReworkInstruction__ { } /// - /// Looks up a localized string similar to Safety doors OK. + /// Looks up a localized string similar to Safety door OK. /// - public static string ___Safety_doors_OK__ { + public static string ___Safety_door_OK__ { get { - return ResourceManager.GetString("___Safety_doors_OK__", resourceCulture); + return ResourceManager.GetString("___Safety_door_OK__", resourceCulture); } } @@ -2173,11 +2191,11 @@ public static string ___Technology_Components__ { } /// - /// Looks up a localized string similar to Technology data. + /// Looks up a localized string similar to Technology data loaded. /// - public static string ___Technology_data__ { + public static string ___Technology_data_loaded__ { get { - return ResourceManager.GetString("___Technology_data__", resourceCulture); + return ResourceManager.GetString("___Technology_data_loaded__", resourceCulture); } } @@ -2208,6 +2226,15 @@ public static string ___Timeout__ { } } + /// + /// Looks up a localized string similar to Traceability. + /// + public static string ___Traceability__ { + get { + return ResourceManager.GetString("___Traceability__", resourceCulture); + } + } + /// /// Looks up a localized string similar to Unlocked. /// diff --git a/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.resx b/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.resx index 0caa6ad..a7273f8 100644 --- a/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.resx +++ b/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.resx @@ -243,6 +243,9 @@ (Consecutive failure) The number of same recurring failure count has been reached! + + PLC connection + Heart beat @@ -552,6 +555,42 @@ Test multi positions + + Control Voltage + + + Air Pressure + + + Emergency stop + + + Safety door OK + + + Door closed + + + Door locked + + + Automat allowed + + + Process data loaded + + + Technology data loaded + + + Light barrier + + + Printer + + + Traceability + AUTOMAT ALL @@ -732,36 +771,6 @@ Rework Count - - Control voltage - - - Air pressure - - - Autmatic mode allowed - - - Emergency stop - - - Safety doors OK - - - Doors closed - - - Doors locked - - - Light curtain - - - Process data - - - Technology data - Key UID