diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index cf381dfdb..005681280 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "AXSharp.ixc": { - "version": "0.46.0-alpha.363", + "version": "0.46.0-alpha.366", "commands": [ "ixc" ], @@ -17,14 +17,14 @@ "rollForward": false }, "AXSharp.ixd": { - "version": "0.46.0-alpha.363", + "version": "0.46.0-alpha.366", "commands": [ "ixd" ], "rollForward": false }, "AXSharp.ixr": { - "version": "0.46.0-alpha.363", + "version": "0.46.0-alpha.366", "commands": [ "ixr" ], @@ -55,3 +55,4 @@ } + diff --git a/.gitignore b/.gitignore index 0aee4be4b..9fdacde63 100644 --- a/.gitignore +++ b/.gitignore @@ -435,3 +435,5 @@ temp/ #JSONREPOS **/JSONREPOS/ + +.cursor diff --git a/Directory.Packages.props b/Directory.Packages.props index 3d9b6aa11..db71d7be5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,11 +11,11 @@ - - - - - + + + + + @@ -90,3 +90,4 @@ + diff --git a/scripts/run-ixr-all-ctrl.ps1 b/scripts/run-ixr-all-ctrl.ps1 new file mode 100644 index 000000000..5743f01c4 --- /dev/null +++ b/scripts/run-ixr-all-ctrl.ps1 @@ -0,0 +1,12 @@ +# Run dotnet ixr in all ctrl directories under src folder +# This script compiles PLC localized strings resources to resx + +$srcPath = Join-Path $PSScriptRoot "..\src" + +Get-ChildItem -Path $srcPath -Recurse -Directory -Filter "ctrl" | ForEach-Object { + Write-Host "Running dotnet ixr in: $($_.FullName)" -ForegroundColor Cyan + Push-Location $_.FullName + dotnet ixr + Pop-Location + Write-Host "" +} diff --git a/src/Security/src/AXOpen.Security.Blazor/Pages/CreateUser.razor b/src/Security/src/AXOpen.Security.Blazor/Pages/CreateUser.razor index 38dd92093..16e374566 100644 --- a/src/Security/src/AXOpen.Security.Blazor/Pages/CreateUser.razor +++ b/src/Security/src/AXOpen.Security.Blazor/Pages/CreateUser.razor @@ -194,7 +194,7 @@ if (Input != null) Input.ExternalAuthId = Encoding.ASCII.GetString(System.Security.Cryptography.SHA512.HashData(Encoding.ASCII.GetBytes(Encoding.ASCII.GetString(data).Trim()))); - _toastService?.AddToast(eToastType.Success, Localizer["Identified!"], "The external token identified", 10); + _toastService?.AddToast(eToastType.Success, Localizer["Identified!"], Localizer["The external token identified"], 10); StateHasChanged(); } diff --git a/src/Security/src/AXOpen.Security.Blazor/Pages/Manage.razor b/src/Security/src/AXOpen.Security.Blazor/Pages/Manage.razor index 11dbffebd..1d0346fbd 100644 --- a/src/Security/src/AXOpen.Security.Blazor/Pages/Manage.razor +++ b/src/Security/src/AXOpen.Security.Blazor/Pages/Manage.razor @@ -230,7 +230,7 @@ if (Input != null) Input.ExternalAuthId = Encoding.ASCII.GetString(System.Security.Cryptography.SHA512.HashData(Encoding.ASCII.GetBytes(Encoding.ASCII.GetString(data).Trim()))); - _toastService?.AddToast(eToastType.Success, Localizer["Identified!"], "The external token identified", 10); + _toastService?.AddToast(eToastType.Success, Localizer["Identified!"], Localizer["The external token identified"], 10); StateHasChanged(); } diff --git a/src/Security/src/AXOpen.Security.Blazor/Pages/UserManagement.razor b/src/Security/src/AXOpen.Security.Blazor/Pages/UserManagement.razor index 28da39fac..03f697665 100644 --- a/src/Security/src/AXOpen.Security.Blazor/Pages/UserManagement.razor +++ b/src/Security/src/AXOpen.Security.Blazor/Pages/UserManagement.razor @@ -226,7 +226,7 @@ var setEmailResult = await _userManager.SetEmailAsync(SelectedUser, Input.Email); if (!setEmailResult.Succeeded) { - _toastService?.AddToast(eToastType.Danger, Localizer["Not updated!"], "Failed to set email.", 10); + _toastService?.AddToast(eToastType.Danger, Localizer["Not updated!"], Localizer["Failed to set email."], 10); return; } } @@ -236,7 +236,7 @@ var setPhoneResult = await _userManager.SetPhoneNumberAsync(SelectedUser, Input.PhoneNumber); if (!setPhoneResult.Succeeded) { - _toastService?.AddToast(eToastType.Danger, Localizer["Not updated!"], "Failed to set phone number.", 10); + _toastService?.AddToast(eToastType.Danger, Localizer["Not updated!"], Localizer["Failed to set phone number."], 10); return; } } @@ -248,7 +248,7 @@ List users = _repositoryService.UserRepository.GetRecords().Where(user => user.ExternalAuthId != null && user.ExternalAuthId.Equals(Input.ExternalAuthId)).ToList(); if (users.Any()) { - _toastService?.AddToast(eToastType.Danger, Localizer["Not updated!"], "Failed to set externalId, because it is being used by another user.", 10); + _toastService?.AddToast(eToastType.Danger, Localizer["Not updated!"], Localizer["Failed to set externalId, because it is being used by another user."], 10); return; } @@ -398,7 +398,7 @@ if (SelectedUser != null) Input.ExternalAuthId = Encoding.ASCII.GetString(System.Security.Cryptography.SHA512.HashData(Encoding.ASCII.GetBytes(Encoding.ASCII.GetString(data).Trim()))); - _toastService?.AddToast(eToastType.Success, Localizer["Identified!"], "The external token identified", 10); + _toastService?.AddToast(eToastType.Success, Localizer["Identified!"], Localizer["The external token identified"], 10); StateHasChanged(); } diff --git a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.Designer.cs b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.Designer.cs index 1b6567c00..155dc3808 100644 --- a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.Designer.cs +++ b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.Designer.cs @@ -222,6 +222,33 @@ internal static string Do_you_want_to_delete_user { } } + /// + /// Looks up a localized string similar to Failed to set email.. + /// + internal static string Failed_to_set_email_ { + get { + return ResourceManager.GetString("Failed to set email.", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to set externalId, because it is being used by another user.. + /// + internal static string Failed_to_set_externalId__because_it_is_being_used_by_another_user_ { + get { + return ResourceManager.GetString("Failed to set externalId, because it is being used by another user.", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to set phone number.. + /// + internal static string Failed_to_set_phone_number_ { + get { + return ResourceManager.GetString("Failed to set phone number.", resourceCulture); + } + } + /// /// Looks up a localized string similar to Group. /// @@ -303,6 +330,15 @@ internal static string Group_was_not_updated_ { } } + /// + /// Looks up a localized string similar to Identified!. + /// + internal static string Identified_ { + get { + return ResourceManager.GetString("Identified!", resourceCulture); + } + } + /// /// Looks up a localized string similar to List of groups:. /// @@ -467,6 +503,15 @@ internal static string Sorry__you_are_not_logged_in__Please_log_in_ { } } + /// + /// Looks up a localized string similar to The external token identified. + /// + internal static string The_external_token_identified { + get { + return ResourceManager.GetString("The external token identified", resourceCulture); + } + } + /// /// Looks up a localized string similar to Update. /// diff --git a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.de.resx b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.de.resx index e8be91d55..3f63d7bc3 100644 --- a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.de.resx +++ b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.de.resx @@ -285,4 +285,19 @@ Gruppenmanagement + + Identifiziert! + + + Das externe Token wurde identifiziert. + + + E-Mail konnte nicht eingerichtet werden. + + + Die Telefonnummer konnte nicht festgelegt werden. + + + Die Einstellung von „externalId“ ist fehlgeschlagen, da diese ID bereits von einem anderen Benutzer verwendet wird. + \ No newline at end of file diff --git a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.es.resx b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.es.resx index d82981a8c..df5ac4227 100644 --- a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.es.resx +++ b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.es.resx @@ -285,4 +285,19 @@ Los Grupos + + ¡Identificado! + + + El token externo identificado + + + No se ha podido configurar el correo electrónico. + + + No se ha podido configurar el número de teléfono. + + + No se ha podido establecer externalId, ya que lo está utilizando otro usuario. + \ No newline at end of file diff --git a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.resx b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.resx index 058a61e65..94f121ff8 100644 --- a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.resx +++ b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.resx @@ -265,4 +265,19 @@ Group Management + + Identified! + + + The external token identified + + + Failed to set email. + + + Failed to set phone number. + + + Failed to set externalId, because it is being used by another user. + \ No newline at end of file diff --git a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.sk.resx b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.sk.resx index 9ab9ee88b..65e948a96 100644 --- a/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.sk.resx +++ b/src/Security/src/AXOpen.Security.Blazor/Resources/BlazorResources.sk.resx @@ -265,4 +265,19 @@ Skupiny + + Identifikované! + + + Identifikovaný externý token + + + Nastavenie e-mailu sa nepodarilo. + + + Nepodarilo sa nastaviť telefónne číslo. + + + Nepodarilo sa nastaviť externalId, pretože ho používa iný používateľ. + \ No newline at end of file diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st index 604bf58a1..65a555095 100644 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st @@ -456,7 +456,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartAtMainTask.ThrowWhen(_errorTimer.output ); Status.Action.Id := TO_UINT(_progress); - StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartAtMainTask timeout.'); + StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartAtMainTask timeout.#>'); END_IF; IF StartAtMainTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -603,7 +603,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartMotorsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsAndProgramTask timeout.'); + StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsAndProgramTask timeout.#>'); END_IF; IF StartMotorsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -850,7 +850,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartMotorsProgramAndMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartMotorsProgramAndMovementsTask.ThrowWhen(StartMotorsProgramAndMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsProgramAndMovementsTask timeout.'); + StartMotorsProgramAndMovementsTask.ThrowWhen(StartMotorsProgramAndMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsProgramAndMovementsTask timeout.#>'); END_IF; IF StartMotorsProgramAndMovementsTask.IsFirstExecutionCycle() THEN MovementParameters := Status.CurrentMovementParameters; @@ -981,7 +981,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartMotorsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartMotorsTask.ThrowWhen(StartMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsTask timeout.'); + StartMotorsTask.ThrowWhen(StartMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsTask timeout.#>'); END_IF; IF StartMotorsTask.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1166,7 +1166,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics StartMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMovementsTask timeout.'); + StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMovementsTask timeout.#>'); END_IF; IF StartMovementsTask.IsFirstExecutionCycle() THEN MovementParameters := Status.CurrentMovementParameters; @@ -1245,7 +1245,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartProgramTask.ThrowWhen(StartProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartProgramTask timeout.'); + StartProgramTask.ThrowWhen(StartProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartProgramTask timeout.#>'); END_IF; IF StartProgramTask.DoneReached() THEN Status.Action.Id := UINT#171; @@ -1321,7 +1321,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StopMotorsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StopMotorsTask.ThrowWhen(StopMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMotorsTask timeout.'); + StopMotorsTask.ThrowWhen(StopMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMotorsTask timeout.#>'); END_IF; IF StopMotorsTask.DoneReached() THEN Status.Action.Id := UINT#181; @@ -1403,7 +1403,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics StopMovementsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsAndProgramTask timeout.'); + StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsAndProgramTask timeout.#>'); END_IF; IF StopMovementsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#191; @@ -1472,7 +1472,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics StopMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsTask timeout.'); + StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsTask timeout.#>'); END_IF; IF StopMovementsTask.DoneReached() THEN Status.Action.Id := UINT#201; @@ -1532,7 +1532,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics StopProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StopProgramTask.ThrowWhen(StopProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopProgramTask timeout.'); + StopProgramTask.ThrowWhen(StopProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopProgramTask timeout.#>'); END_IF; IF StopProgramTask.DoneReached() THEN Status.Action.Id := UINT#211; diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st index 6ab6a4896..592252ce6 100644 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st @@ -505,7 +505,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartAtMainTask.ThrowWhen(_errorTimer.output ); Status.Action.Id := TO_UINT(_power_progress); - StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartAtMainTask timeout.'); + StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartAtMainTask timeout.#>'); END_IF; IF StartAtMainTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -652,7 +652,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartMotorsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsAndProgramTask timeout.'); + StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsAndProgramTask timeout.#>'); END_IF; IF StartMotorsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -900,7 +900,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartMotorsProgramAndMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StartMotorsProgramAndMovementsTask.ThrowWhen(StartMotorsProgramAndMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsProgramAndMovementsTask timeout.'); + StartMotorsProgramAndMovementsTask.ThrowWhen(StartMotorsProgramAndMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsProgramAndMovementsTask timeout.#>'); END_IF; IF StartMotorsProgramAndMovementsTask.IsFirstExecutionCycle() THEN MovementParameters := Status.CurrentMovementParameters; @@ -1031,7 +1031,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartMotorsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StartMotorsTask.ThrowWhen(StartMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsTask timeout.'); + StartMotorsTask.ThrowWhen(StartMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsTask timeout.#>'); END_IF; IF StartMotorsTask.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1217,7 +1217,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics StartMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_movement_progress); - StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMovementsTask timeout.'); + StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMovementsTask timeout.#>'); END_IF; IF StartMovementsTask.IsFirstExecutionCycle() THEN MovementParameters := Status.CurrentMovementParameters; @@ -1296,7 +1296,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StartProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StartProgramTask.ThrowWhen(StartProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartProgramTask timeout.'); + StartProgramTask.ThrowWhen(StartProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartProgramTask timeout.#>'); END_IF; IF StartProgramTask.DoneReached() THEN Status.Action.Id := UINT#171; @@ -1372,7 +1372,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics THIS.CallTimers(TRUE); StopMotorsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StopMotorsTask.ThrowWhen(StopMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMotorsTask timeout.'); + StopMotorsTask.ThrowWhen(StopMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMotorsTask timeout.#>'); END_IF; IF StopMotorsTask.DoneReached() THEN Status.Action.Id := UINT#181; @@ -1456,7 +1456,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics StopMovementsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsAndProgramTask timeout.'); + StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsAndProgramTask timeout.#>'); END_IF; IF StopMovementsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#191; @@ -1525,7 +1525,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics StopMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsTask timeout.'); + StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsTask timeout.#>'); END_IF; IF StopMovementsTask.DoneReached() THEN Status.Action.Id := UINT#201; @@ -1585,7 +1585,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics StopProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StopProgramTask.ThrowWhen(StopProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopProgramTask timeout.'); + StopProgramTask.ThrowWhen(StopProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopProgramTask timeout.#>'); END_IF; IF StopProgramTask.DoneReached() THEN Status.Action.Id := UINT#211; diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.Designer.cs b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.Designer.cs index 4a827c9b4..206b12527 100644 --- a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.Designer.cs +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,95 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to StartAtMainTask timeout.. + /// + public static string StartAtMainTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartAtMainTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMotorsAndProgramTask timeout.. + /// + public static string StartMotorsAndProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMotorsAndProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMotorsProgramAndMovementsTask timeout.. + /// + public static string StartMotorsProgramAndMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMotorsProgramAndMovementsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMotorsTask timeout.. + /// + public static string StartMotorsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMotorsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMovementsTask timeout.. + /// + public static string StartMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMovementsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartProgramTask timeout.. + /// + public static string StartProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMotorsTask timeout.. + /// + public static string StopMotorsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMotorsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMovementsAndProgramTask timeout.. + /// + public static string StopMovementsAndProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMovementsAndProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMovementsTask timeout.. + /// + public static string StopMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMovementsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopProgramTask timeout.. + /// + public static string StopProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopProgramTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.de.resx b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..e104e842a --- /dev/null +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.de.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + StartAtMainTask-Zeitüberschreitung. + + + StartMotorsAndProgramTask Zeitüberschreitung. + + + StartMotorsProgramAndMovementsTask Zeitüberschreitung. + + + StartMotorsTask Zeitüberschreitung. + + + StartMovementsTask Zeitüberschreitung. + + + StartProgrammAufgabe Zeitüberschreitung. + + + StopMotorsTask Zeitüberschreitung. + + + StopMovementsAndProgramTask timeout. + + + StopMovementsTask Zeitüberschreitung. + + + StopProgramTask Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.es.resx b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..8d6cce38a --- /dev/null +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.es.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de StartAtMainTask. + + + Tiempo de espera de StartMotorsAndProgramTask. + + + Tiempo de espera de StartMotorsProgramAndMovementsTask. + + + Tiempo de espera de StartMotorsTask. + + + Tiempo de espera de StartMovementsTask. + + + Tiempo de espera de StartProgramTask. + + + Tiempo de espera de StopMotorsTask. + + + Tiempo de espera de StopMovementsAndProgramTask. + + + Tiempo de espera de StopMovementsTask. + + + Tiempo de espera de StopProgramTask. + + \ No newline at end of file diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.resx b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.resx index e8ae276d9..69bcf454f 100644 --- a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.resx +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.resx @@ -58,4 +58,44 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StartAtMainTask timeout. + src\AxoIrc5_v_1_x_x.st,458 + + + StartMotorsAndProgramTask timeout. + src\AxoIrc5_v_1_x_x.st,605 + + + StartMotorsProgramAndMovementsTask timeout. + src\AxoIrc5_v_1_x_x.st,852 + + + StartMotorsTask timeout. + src\AxoIrc5_v_1_x_x.st,983 + + + StartMovementsTask timeout. + src\AxoIrc5_v_1_x_x.st,1168 + + + StartProgramTask timeout. + src\AxoIrc5_v_1_x_x.st,1247 + + + StopMotorsTask timeout. + src\AxoIrc5_v_1_x_x.st,1323 + + + StopMovementsAndProgramTask timeout. + src\AxoIrc5_v_1_x_x.st,1405 + + + StopMovementsTask timeout. + src\AxoIrc5_v_1_x_x.st,1474 + + + StopProgramTask timeout. + src\AxoIrc5_v_1_x_x.st,1534 + \ No newline at end of file diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.sk.resx b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..09d44ee5a --- /dev/null +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/Resources/PlcStringResources.sk.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit StartAtMainTask. + + + Časový limit StartMotorsAndProgramTask. + + + StartMotorsProgramAndMovementsTask timeout. + + + Časový limit StartMotorsTask. + + + Časový limit StartMovementsTask. + + + Časový limit StartProgramTask. + + + StopMotorsTask timeout. + + + StopMovementsAndProgramTask timeout. + + + StopMovementsTask timeout. + + + StopProgramTask timeout. + + \ No newline at end of file diff --git a/src/components.abstractions/src/AXOpen.Components.Abstractions/Resources/PlcStringResources.resx b/src/components.abstractions/src/AXOpen.Components.Abstractions/Resources/PlcStringResources.resx index 73af8a3f4..e8ae276d9 100644 --- a/src/components.abstractions/src/AXOpen.Components.Abstractions/Resources/PlcStringResources.resx +++ b/src/components.abstractions/src/AXOpen.Components.Abstractions/Resources/PlcStringResources.resx @@ -58,16 +58,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Command state - - - Stepping mode - - - Sequence mode - - - Run step - \ No newline at end of file diff --git a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045.st b/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045.st index 386a2c120..f1d958b5b 100644 --- a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045.st +++ b/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045.st @@ -484,7 +484,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification THIS.CallTimers(TRUE); ReadTask.ThrowWhen(_errorTimer.output ); Status.Action.Id := TO_UINT(_progress); - ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadTask timeout.'); + ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadTask timeout.#>'); END_IF; IF ReadTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -721,7 +721,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification THIS.CallTimers(TRUE); WriteTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - WriteTask.ThrowWhen(WriteTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'WriteTask timeout.'); + WriteTask.ThrowWhen(WriteTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#WriteTask timeout.#>'); END_IF; IF WriteTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -804,7 +804,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification THIS.CallTimers(TRUE); ResetCommunicationTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ResetCommunicationTask.ThrowWhen(ResetCommunicationTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ResetCommunicationTask timeout.'); + ResetCommunicationTask.ThrowWhen(ResetCommunicationTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ResetCommunicationTask timeout.#>'); END_IF; IF ResetCommunicationTask.IsFirstExecutionCycle() THEN ; @@ -907,7 +907,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification THIS.CallTimers(TRUE); ResetReaderTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ResetReaderTask.ThrowWhen(ResetReaderTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ResetReaderTask timeout.'); + ResetReaderTask.ThrowWhen(ResetReaderTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ResetReaderTask timeout.#>'); END_IF; IF ResetReaderTask.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1062,7 +1062,7 @@ NAMESPACE AXOpen.Components.Balluff.Identification WriteCharToMemoryTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - WriteCharToMemoryTask.ThrowWhen(WriteCharToMemoryTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'WriteCharToMemoryTask timeout.'); + WriteCharToMemoryTask.ThrowWhen(WriteCharToMemoryTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#WriteCharToMemoryTask timeout.#>'); END_IF; IF WriteCharToMemoryTask.IsFirstExecutionCycle() THEN ; diff --git a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.Designer.cs b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.Designer.cs index 070f4827a..52debe395 100644 --- a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.Designer.cs +++ b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,50 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to ReadTask timeout.. + /// + public static string ReadTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ReadTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ResetCommunicationTask timeout.. + /// + public static string ResetCommunicationTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ResetCommunicationTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ResetReaderTask timeout.. + /// + public static string ResetReaderTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ResetReaderTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WriteCharToMemoryTask timeout.. + /// + public static string WriteCharToMemoryTask_timeout_DOT_ { + get { + return ResourceManager.GetString("WriteCharToMemoryTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WriteTask timeout.. + /// + public static string WriteTask_timeout_DOT_ { + get { + return ResourceManager.GetString("WriteTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.de.resx b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..8d6e51123 --- /dev/null +++ b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.de.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ReadTask Zeitüberschreitung. + + + WriteTask Zeitüberschreitung. + + + ResetCommunicationTask Zeitüberschreitung. + + + ResetReaderTask Zeitüberschreitung. + + + WriteCharToMemoryTask Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.es.resx b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..3397b37c7 --- /dev/null +++ b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.es.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de ReadTask. + + + Tiempo de espera de WriteTask. + + + Tiempo de espera de ResetCommunicationTask. + + + Tiempo de espera de ResetReaderTask. + + + Tiempo de espera de WriteCharToMemoryTask. + + \ No newline at end of file diff --git a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.resx b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.resx index e8ae276d9..9d72b1f78 100644 --- a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.resx +++ b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.resx @@ -58,4 +58,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ReadTask timeout. + src\Axo_BIS_M_4XX_045.st,488 + + + WriteTask timeout. + src\Axo_BIS_M_4XX_045.st,725 + + + ResetCommunicationTask timeout. + src\Axo_BIS_M_4XX_045.st,808 + + + ResetReaderTask timeout. + src\Axo_BIS_M_4XX_045.st,911 + + + WriteCharToMemoryTask timeout. + src\Axo_BIS_M_4XX_045.st,1066 + \ No newline at end of file diff --git a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.sk.resx b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..19d10df54 --- /dev/null +++ b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Resources/PlcStringResources.sk.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit ReadTask. + + + Časový limit úlohy WriteTask. + + + Časový limit ResetCommunicationTask. + + + Časový limit ResetReaderTask. + + + Časový limit úlohy WriteCharToMemoryTask. + + \ No newline at end of file diff --git a/src/components.cognex.vision/ctrl/src/AxoDataman/v_6_0_0/AxoDataman.st b/src/components.cognex.vision/ctrl/src/AxoDataman/v_6_0_0/AxoDataman.st index 323cc5c86..0cc78e59b 100644 --- a/src/components.cognex.vision/ctrl/src/AxoDataman/v_6_0_0/AxoDataman.st +++ b/src/components.cognex.vision/ctrl/src/AxoDataman/v_6_0_0/AxoDataman.st @@ -679,7 +679,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 ClearResultDataTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ClearResultDataTask.ThrowWhen(ClearResultDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ClearResultDataTask timeout.'); + ClearResultDataTask.ThrowWhen(ClearResultDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ClearResultDataTask timeout.#>'); END_IF; IF ClearResultDataTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -869,7 +869,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 ReadTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadTask timeout.'); + ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadTask timeout.#>'); END_IF; IF ReadTask.DoneReached() THEN Status.Action.Id := UINT#111; diff --git a/src/components.cognex.vision/ctrl/src/AxoInsight/v_24_0_0/AxoInsight.st b/src/components.cognex.vision/ctrl/src/AxoInsight/v_24_0_0/AxoInsight.st index 7373a3bd2..d3eb478ae 100644 --- a/src/components.cognex.vision/ctrl/src/AxoInsight/v_24_0_0/AxoInsight.st +++ b/src/components.cognex.vision/ctrl/src/AxoInsight/v_24_0_0/AxoInsight.st @@ -1209,7 +1209,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 ClearInspectionResultsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ClearInspectionResultsTask.ThrowWhen(ClearInspectionResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ClearInspectionResultsTask timeout.'); + ClearInspectionResultsTask.ThrowWhen(ClearInspectionResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ClearInspectionResultsTask timeout.#>'); END_IF; IF ClearInspectionResultsTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -1455,7 +1455,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 TriggerTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TriggerTask.ThrowWhen(TriggerTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TriggerTask timeout.'); + TriggerTask.ThrowWhen(TriggerTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TriggerTask timeout.#>'); END_IF; IF TriggerTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -1672,7 +1672,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 THIS.CallTimers(TRUE); ChangeJobByNameTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ChangeJobByNameTask.ThrowWhen(ChangeJobByNameTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ChangeJobByNameTask timeout.'); + ChangeJobByNameTask.ThrowWhen(ChangeJobByNameTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ChangeJobByNameTask timeout.#>'); END_IF; IF ChangeJobByNameTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -1833,7 +1833,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 THIS.CallTimers(TRUE); ChangeJobByNumberTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ChangeJobByNumberTask.ThrowWhen(ChangeJobByNumberTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ChangeJobByNumberTask timeout.'); + ChangeJobByNumberTask.ThrowWhen(ChangeJobByNumberTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ChangeJobByNumberTask timeout.#>'); END_IF; IF ChangeJobByNumberTask.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1926,7 +1926,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 THIS.CallTimers(TRUE); SoftEventTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - SoftEventTask.ThrowWhen(SoftEventTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'SoftEventTask timeout.'); + SoftEventTask.ThrowWhen(SoftEventTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#SoftEventTask timeout.#>'); END_IF; IF SoftEventTask.DoneReached() THEN Status.Action.Id := UINT#151; @@ -2062,7 +2062,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_24_0_0 THIS.CallTimers(TRUE); SendUserDataTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - SendUserDataTask.ThrowWhen(SendUserDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'SendUserDataTask timeout.'); + SendUserDataTask.ThrowWhen(SendUserDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#SendUserDataTask timeout.#>'); END_IF; IF SendUserDataTask.DoneReached() THEN Status.Action.Id := UINT#161; diff --git a/src/components.cognex.vision/ctrl/src/AxoInsight/v_6_0_0/AxoInsight.st b/src/components.cognex.vision/ctrl/src/AxoInsight/v_6_0_0/AxoInsight.st index c8756bb9e..6c36cb724 100644 --- a/src/components.cognex.vision/ctrl/src/AxoInsight/v_6_0_0/AxoInsight.st +++ b/src/components.cognex.vision/ctrl/src/AxoInsight/v_6_0_0/AxoInsight.st @@ -802,7 +802,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 ClearInspectionResultsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ClearInspectionResultsTask.ThrowWhen(ClearInspectionResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ClearInspectionResultsTask timeout.'); + ClearInspectionResultsTask.ThrowWhen(ClearInspectionResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ClearInspectionResultsTask timeout.#>'); END_IF; IF ClearInspectionResultsTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -984,7 +984,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 TriggerTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TriggerTask.ThrowWhen(TriggerTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TriggerTask timeout.'); + TriggerTask.ThrowWhen(TriggerTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TriggerTask timeout.#>'); END_IF; IF TriggerTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -1201,7 +1201,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 THIS.CallTimers(TRUE); ChangeJobByNameTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ChangeJobByNameTask.ThrowWhen(ChangeJobByNameTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ChangeJobByNameTask timeout.'); + ChangeJobByNameTask.ThrowWhen(ChangeJobByNameTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ChangeJobByNameTask timeout.#>'); END_IF; IF ChangeJobByNameTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -1362,7 +1362,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 THIS.CallTimers(TRUE); ChangeJobByNumberTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ChangeJobByNumberTask.ThrowWhen(ChangeJobByNumberTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ChangeJobByNumberTask timeout.'); + ChangeJobByNumberTask.ThrowWhen(ChangeJobByNumberTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ChangeJobByNumberTask timeout.#>'); END_IF; IF ChangeJobByNumberTask.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1455,7 +1455,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 THIS.CallTimers(TRUE); SoftEventTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - SoftEventTask.ThrowWhen(SoftEventTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'SoftEventTask timeout.'); + SoftEventTask.ThrowWhen(SoftEventTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#SoftEventTask timeout.#>'); END_IF; IF SoftEventTask.DoneReached() THEN Status.Action.Id := UINT#151; @@ -1591,7 +1591,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision.v_6_0_0_0 THIS.CallTimers(TRUE); SendUserDataTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - SendUserDataTask.ThrowWhen(SendUserDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'SendUserDataTask timeout.'); + SendUserDataTask.ThrowWhen(SendUserDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#SendUserDataTask timeout.#>'); END_IF; IF SendUserDataTask.DoneReached() THEN Status.Action.Id := UINT#161; diff --git a/src/components.cognex.vision/ctrl/src/AxoVisionPro/AxoVisionPro.st b/src/components.cognex.vision/ctrl/src/AxoVisionPro/AxoVisionPro.st index fd2d09a53..ca65fd726 100644 --- a/src/components.cognex.vision/ctrl/src/AxoVisionPro/AxoVisionPro.st +++ b/src/components.cognex.vision/ctrl/src/AxoVisionPro/AxoVisionPro.st @@ -1282,7 +1282,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision HardResetAllCamerasTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - HardResetAllCamerasTask.ThrowWhen(HardResetAllCamerasTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'HardResetAllCamerasTask timeout.'); + HardResetAllCamerasTask.ThrowWhen(HardResetAllCamerasTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#HardResetAllCamerasTask timeout.#>'); END_IF; IF HardResetAllCamerasTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -1466,7 +1466,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision ResetTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ResetTask.ThrowWhen(ResetTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ResetTask timeout.'); + ResetTask.ThrowWhen(ResetTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ResetTask timeout.#>'); END_IF; IF ResetTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -1628,7 +1628,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision TriggerTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TriggerTask.ThrowWhen(TriggerTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TriggerTask timeout.'); + TriggerTask.ThrowWhen(TriggerTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TriggerTask timeout.#>'); END_IF; IF TriggerTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -1781,7 +1781,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TemplateTask_10steps_4.ThrowWhen(_errorTimer.output); // Status.Action.Id := TO_UINT(_progress); - // TemplateTask_10steps_4.ThrowWhen(TemplateTask_10steps_4.Duration >= Config.ErrorTime ,'TemplateTask_10steps_4 error.'); + // TemplateTask_10steps_4.ThrowWhen(TemplateTask_10steps_4.Duration >= Config.ErrorTime ,'<#TemplateTask_10steps_4 error.#>'); // END_IF; // IF TemplateTask_10steps_4.DoneReached() THEN // Status.Action.Id := UINT#131; @@ -1934,7 +1934,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TemplateTask_10steps_5.ThrowWhen(_errorTimer.output); // Status.Action.Id := TO_UINT(_progress); - // TemplateTask_10steps_5.ThrowWhen(TemplateTask_10steps_5.Duration >= Config.ErrorTime ,'TemplateTask_10steps_5 error.'); + // TemplateTask_10steps_5.ThrowWhen(TemplateTask_10steps_5.Duration >= Config.ErrorTime ,'<#TemplateTask_10steps_5 error.#>'); // END_IF; // IF TemplateTask_10steps_5.DoneReached() THEN // Status.Action.Id := UINT#141; @@ -2087,7 +2087,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TemplateTask_10steps_6.ThrowWhen(_errorTimer.output); // Status.Action.Id := TO_UINT(_progress); - // TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.ErrorTime ,'TemplateTask_10steps_6 error.'); + // TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.ErrorTime ,'<#TemplateTask_10steps_6 error.#>'); // END_IF; // IF TemplateTask_10steps_6.DoneReached() THEN // Status.Action.Id := UINT#151; @@ -2539,7 +2539,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision THIS.CallTimers(TRUE); ReadResultsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ReadResultsTask.ThrowWhen(ReadResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadResultsTask timeout.'); + ReadResultsTask.ThrowWhen(ReadResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadResultsTask timeout.#>'); END_IF; IF ReadResultsTask.DoneReached() THEN Status.Action.Id := UINT#161; @@ -3055,7 +3055,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision SendDataTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - SendDataTask.ThrowWhen(SendDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'SendDataTask timeout.'); + SendDataTask.ThrowWhen(SendDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#SendDataTask timeout.#>'); END_IF; IF SendDataTask.DoneReached() THEN Status.Action.Id := UINT#181; @@ -3328,7 +3328,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TemplateTask_20steps_3.ThrowWhen(_errorTimer.output); // Status.Action.Id := TO_UINT(_progress); - // TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.ErrorTime ,'TemplateTask_20steps_3 error.'); + // TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.ErrorTime ,'<#TemplateTask_20steps_3 error.#>'); // END_IF; // IF TemplateTask_20steps_3.DoneReached() THEN // Status.Action.Id := UINT#201; @@ -3601,7 +3601,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TemplateTask_20steps_4.ThrowWhen(_errorTimer.output); // Status.Action.Id := TO_UINT(_progress); - // TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.ErrorTime ,'TemplateTask_20steps_4 error'); + // TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.ErrorTime ,'<#TemplateTask_20steps_4 error#>'); // END_IF; // IF TemplateTask_20steps_4.DoneReached() THEN // Status.Action.Id := UINT#221; @@ -3874,7 +3874,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TemplateTask_20steps_5.ThrowWhen(_errorTimer.output); // Status.Action.Id := TO_UINT(_progress); - // TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.ErrorTime ,'TemplateTask_20steps_5 error.'); + // TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.ErrorTime ,'<#TemplateTask_20steps_5 error.#>'); // END_IF; // IF TemplateTask_20steps_5.DoneReached() THEN // Status.Action.Id := UINT#241; @@ -4147,7 +4147,7 @@ NAMESPACE AXOpen.Components.Cognex.Vision // TemplateTask_20steps_6.ThrowWhen(_errorTimer.output); // Status.Action.Id := TO_UINT(_progress); - // TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.ErrorTime ,'TemplateTask_20steps_6 error.'); + // TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.ErrorTime ,'<#TemplateTask_20steps_6 error.#>'); // END_IF; // IF TemplateTask_20steps_6.DoneReached() THEN // Status.Action.Id := UINT#261; diff --git a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.Designer.cs b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.Designer.cs index 3ad1d0a9a..f48ba4d80 100644 --- a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.Designer.cs +++ b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,113 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to ChangeJobByNameTask timeout.. + /// + public static string ChangeJobByNameTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ChangeJobByNameTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ChangeJobByNumberTask timeout.. + /// + public static string ChangeJobByNumberTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ChangeJobByNumberTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ClearInspectionResultsTask timeout.. + /// + public static string ClearInspectionResultsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ClearInspectionResultsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ClearResultDataTask timeout.. + /// + public static string ClearResultDataTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ClearResultDataTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to HardResetAllCamerasTask timeout.. + /// + public static string HardResetAllCamerasTask_timeout_DOT_ { + get { + return ResourceManager.GetString("HardResetAllCamerasTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReadResultsTask timeout.. + /// + public static string ReadResultsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ReadResultsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReadTask timeout.. + /// + public static string ReadTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ReadTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ResetTask timeout.. + /// + public static string ResetTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ResetTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SendDataTask timeout.. + /// + public static string SendDataTask_timeout_DOT_ { + get { + return ResourceManager.GetString("SendDataTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SendUserDataTask timeout.. + /// + public static string SendUserDataTask_timeout_DOT_ { + get { + return ResourceManager.GetString("SendUserDataTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SoftEventTask timeout.. + /// + public static string SoftEventTask_timeout_DOT_ { + get { + return ResourceManager.GetString("SoftEventTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TriggerTask timeout.. + /// + public static string TriggerTask_timeout_DOT_ { + get { + return ResourceManager.GetString("TriggerTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.de.resx b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..bf31d4ab5 --- /dev/null +++ b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.de.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + HardResetAllCamerasTask Zeitüberschreitung. + + + ResetTask Zeitüberschreitung. + + + TriggerTask-Zeitüberschreitung. + + + ReadResultsTask Zeitüberschreitung. + + + SendDataTask Zeitüberschreitung. + + + ClearResultDataTask Zeitüberschreitung. + + + ReadTask Zeitüberschreitung. + + + ClearInspectionResultsTask Zeitüberschreitung. + + + ChangeJobByNameTask Zeitüberschreitung. + + + ChangeJobByNumberTask Zeitüberschreitung. + + + SoftEventTask Zeitüberschreitung. + + + SendUserDataTask Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.es.resx b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..663bc9a39 --- /dev/null +++ b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.es.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de HardResetAllCamerasTask. + + + Tiempo de espera de ResetTask. + + + Tiempo de espera de TriggerTask. + + + Tiempo de espera de ReadResultsTask. + + + Tiempo de espera de SendDataTask. + + + Tiempo de espera de ClearResultDataTask. + + + Tiempo de espera de ReadTask. + + + Tiempo de espera de ClearInspectionResultsTask. + + + Tiempo de espera de ChangeJobByNameTask. + + + Tiempo de espera de ChangeJobByNumberTask. + + + Tiempo de espera de SoftEventTask. + + + Tiempo de espera de SendUserDataTask. + + \ No newline at end of file diff --git a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.resx b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.resx index e8ae276d9..969d495a0 100644 --- a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.resx +++ b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.resx @@ -58,4 +58,52 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + HardResetAllCamerasTask timeout. + src\AxoVisionPro\AxoVisionPro.st,1284 + + + ResetTask timeout. + src\AxoVisionPro\AxoVisionPro.st,1468 + + + TriggerTask timeout. + src\AxoVisionPro\AxoVisionPro.st,1630 + + + ReadResultsTask timeout. + src\AxoVisionPro\AxoVisionPro.st,2541 + + + SendDataTask timeout. + src\AxoVisionPro\AxoVisionPro.st,3057 + + + ClearResultDataTask timeout. + src\AxoDataman\v_6_0_0\AxoDataman.st,681 + + + ReadTask timeout. + src\AxoDataman\v_6_0_0\AxoDataman.st,871 + + + ClearInspectionResultsTask timeout. + src\AxoInsight\v_24_0_0\AxoInsight.st,1211 + + + ChangeJobByNameTask timeout. + src\AxoInsight\v_24_0_0\AxoInsight.st,1674 + + + ChangeJobByNumberTask timeout. + src\AxoInsight\v_24_0_0\AxoInsight.st,1835 + + + SoftEventTask timeout. + src\AxoInsight\v_24_0_0\AxoInsight.st,1928 + + + SendUserDataTask timeout. + src\AxoInsight\v_24_0_0\AxoInsight.st,2064 + \ No newline at end of file diff --git a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.sk.resx b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..3743f727c --- /dev/null +++ b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/Resources/PlcStringResources.sk.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + HardResetAllCamerasTask timeout. + + + Časový limit ResetTask. + + + Časový limit TriggerTask. + + + Časový limit úlohy ReadResultsTask. + + + Časový limit SendDataTask. + + + Časový limit ClearResultDataTask. + + + Časový limit ReadTask. + + + Časový limit ClearInspectionResultsTask. + + + ChangeJobByNameTask časový limit. + + + ChangeJobByNumberTask časový limit. + + + Časový limit SoftEventTask. + + + Časový limit SendUserDataTask. + + \ No newline at end of file diff --git a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II.st b/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II.st index bd764ba67..135c6a08d 100644 --- a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II.st +++ b/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II.st @@ -709,7 +709,7 @@ NAMESPACE AXOpen.Components.Desoutter.Tightening ResetTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ResetTask.ThrowWhen(ResetTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ResetTask timeout.'); + ResetTask.ThrowWhen(ResetTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ResetTask timeout.#>'); END_IF; IF ResetTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -776,7 +776,7 @@ NAMESPACE AXOpen.Components.Desoutter.Tightening _progress := 0; END_IF; - SetScrewingProgramTask.ThrowWhen(SetScrewingProgramTask.Duration > Config.ProgramChangeTimeout, 'Unable to change the screwing program.'); + SetScrewingProgramTask.ThrowWhen(SetScrewingProgramTask.Duration > Config.ProgramChangeTimeout,'<#Unable to change the screwing program.#>'); THIS.CallTimers(TRUE); Status.Action.Id := TO_UINT(_progress); END_IF; @@ -948,7 +948,7 @@ NAMESPACE AXOpen.Components.Desoutter.Tightening StartScrewingTask.DoneWhen(TRUE); END_IF; - StartScrewingTask.ThrowWhen(StartScrewingTask.Duration > Config.ScrewingCycleTimeout, 'Screwing cycle takes too long.'); + StartScrewingTask.ThrowWhen(StartScrewingTask.Duration > Config.ScrewingCycleTimeout,'<#Screwing cycle takes too long.#>'); Status.Action.Id := TO_UINT(_progress); THIS.CallTimers(TRUE); END_IF; diff --git a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.Designer.cs b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.Designer.cs index e93b8e7ee..cf87cbb71 100644 --- a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.Designer.cs +++ b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,32 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to ResetTask timeout.. + /// + public static string ResetTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ResetTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Screwing cycle takes too long.. + /// + public static string Screwing_cycle_takes_too_long_DOT_ { + get { + return ResourceManager.GetString("Screwing_cycle_takes_too_long_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to change the screwing program.. + /// + public static string Unable_to_change_the_screwing_program_DOT_ { + get { + return ResourceManager.GetString("Unable_to_change_the_screwing_program_DOT_", resourceCulture); + } + } } } diff --git a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.de.resx b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..61fd15bff --- /dev/null +++ b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.de.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ResetTask Zeitüberschreitung. + + + Sie können das Schraubprogramm nicht ändern. + + + Der Verschraubungszyklus dauert zu lange. + + \ No newline at end of file diff --git a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.es.resx b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..d2b2fb20a --- /dev/null +++ b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.es.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de ResetTask. + + + No se puede cambiar el programa de atornillado. + + + El ciclo de atornillado dura demasiado. + + \ No newline at end of file diff --git a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.resx b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.resx index e8ae276d9..3cc61a708 100644 --- a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.resx +++ b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.resx @@ -58,4 +58,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ResetTask timeout. + src\CVIC_II\AxoCVIC_II.st,711 + + + Unable to change the screwing program. + src\CVIC_II\AxoCVIC_II.st,778 + + + Screwing cycle takes too long. + src\CVIC_II\AxoCVIC_II.st,950 + \ No newline at end of file diff --git a/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.sk.resx b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..1fa0c1828 --- /dev/null +++ b/src/components.desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/Resources/PlcStringResources.sk.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit ResetTask. + + + Nie je možné zmeniť skrutkovací program. + + + Skrutkovací cyklus trvá príliš dlho. + + \ No newline at end of file diff --git a/src/components.drives/ctrl/src/AxoDrives/AxoDrive.st b/src/components.drives/ctrl/src/AxoDrives/AxoDrive.st index 64efda3a4..3f385f739 100644 --- a/src/components.drives/ctrl/src/AxoDrives/AxoDrive.st +++ b/src/components.drives/ctrl/src/AxoDrives/AxoDrive.st @@ -1311,7 +1311,7 @@ NAMESPACE AXOpen.Components.Drives IF AxoHalt_Task.IsBusy() THEN AxoHalt_Task.DoneWhen(AxoHalt_Done); - AxoHalt_Task.ThrowWhen(AxoHalt_Error,CONCAT('MC_Halt has thrown an error: ', ToString(AxoHalt_ErrorID))); + AxoHalt_Task.ThrowWhen(AxoHalt_Error,CONCAT('<#MC_Halt has thrown an error: #>', ToString(AxoHalt_ErrorID))); IF AxoHalt_CommandAborted THEN AxoHalt_Task.Abort(); END_IF; @@ -1366,7 +1366,7 @@ NAMESPACE AXOpen.Components.Drives AxoHome_Deceleration := _AxoHome_Deceleration; END_IF; AxoHome_Task.DoneWhen(AxoHome_Done); - AxoHome_Task.ThrowWhen(AxoHome_Error,CONCAT('MC_Home has thrown an error: ', ToString(AxoHome_ErrorID))); + AxoHome_Task.ThrowWhen(AxoHome_Error,CONCAT('<#MC_Home has thrown an error: #>', ToString(AxoHome_ErrorID))); IF AxoHome_CommandAborted THEN AxoHome_Task.Abort(); END_IF; @@ -1410,7 +1410,7 @@ NAMESPACE AXOpen.Components.Drives AxoMoveAbsolute_Direction := _AxoMoveAbsolute_Direction; END_IF; AxoMoveAbsolute_Task.DoneWhen(AxoMoveAbsolute_Done); - AxoMoveAbsolute_Task.ThrowWhen(AxoMoveAbsolute_Error,CONCAT('MC_MoveAbsolute has thrown an error: ', ToString(AxoMoveAbsolute_ErrorID))); + AxoMoveAbsolute_Task.ThrowWhen(AxoMoveAbsolute_Error,CONCAT('<#MC_MoveAbsolute has thrown an error: #>', ToString(AxoMoveAbsolute_ErrorID))); IF AxoMoveAbsolute_CommandAborted THEN AxoMoveAbsolute_Task.Abort(); END_IF; @@ -1452,7 +1452,7 @@ NAMESPACE AXOpen.Components.Drives AxoMoveRelative_Jerk := _AxoMoveRelative_Jerk; END_IF; AxoMoveRelative_Task.DoneWhen(AxoMoveRelative_Done); - AxoMoveRelative_Task.ThrowWhen(AxoMoveRelative_Error,CONCAT('MC_MoveRelative has thrown an error: ', ToString(AxoMoveRelative_ErrorID))); + AxoMoveRelative_Task.ThrowWhen(AxoMoveRelative_Error,CONCAT('<#MC_MoveRelative has thrown an error: #>', ToString(AxoMoveRelative_ErrorID))); IF AxoMoveRelative_CommandAborted THEN AxoMoveRelative_Task.Abort(); END_IF; @@ -1494,7 +1494,7 @@ NAMESPACE AXOpen.Components.Drives AxoMoveAdditive_Jerk := _AxoMoveAdditive_Jerk; END_IF; AxoMoveAdditive_Task.DoneWhen(AxoMoveAdditive_Done); - AxoMoveAdditive_Task.ThrowWhen(AxoMoveAdditive_Error,CONCAT('MC_MoveAdditive has thrown an error: ', ToString(AxoMoveAdditive_ErrorID))); + AxoMoveAdditive_Task.ThrowWhen(AxoMoveAdditive_Error,CONCAT('<#MC_MoveAdditive has thrown an error: #>', ToString(AxoMoveAdditive_ErrorID))); IF AxoMoveAdditive_CommandAborted THEN AxoMoveAdditive_Task.Abort(); END_IF; @@ -1538,7 +1538,7 @@ NAMESPACE AXOpen.Components.Drives AxoMoveVelocity_Direction := _AxoMoveVelocity_Direction; END_IF; AxoMoveVelocity_Task.DoneWhen(AxoMoveVelocity_InVelocity AND NOT _AxoMoveVelocity_ContinuousUpdate); - AxoMoveVelocity_Task.ThrowWhen(AxoMoveVelocity_Error,CONCAT('MC_MoveVelocity has thrown an error: ', ToString(AxoMoveVelocity_ErrorID))); + AxoMoveVelocity_Task.ThrowWhen(AxoMoveVelocity_Error,CONCAT('<#MC_MoveVelocity has thrown an error: #>', ToString(AxoMoveVelocity_ErrorID))); IF AxoMoveVelocity_CommandAborted THEN AxoMoveVelocity_Task.Abort(); END_IF; @@ -1585,7 +1585,7 @@ NAMESPACE AXOpen.Components.Drives AxoTorqueControl_Direction := _AxoTorqueControl_Direction; END_IF; AxoTorqueControl_Task.DoneWhen(AxoTorqueControl_InTorque AND NOT _AxoTorqueControl_ContinuousUpdate); - AxoTorqueControl_Task.ThrowWhen(AxoTorqueControl_Error,CONCAT('MC_TorqueControl has thrown an error: ', ToString(AxoTorqueControl_ErrorID))); + AxoTorqueControl_Task.ThrowWhen(AxoTorqueControl_Error,CONCAT('<#MC_TorqueControl has thrown an error: #>', ToString(AxoTorqueControl_ErrorID))); IF AxoTorqueControl_CommandAborted THEN AxoTorqueControl_Task.Abort(); END_IF; @@ -1617,7 +1617,7 @@ NAMESPACE AXOpen.Components.Drives IF AxoSetPosition_Task.IsBusy() THEN AxoSetPosition_Task.DoneWhen(AxoSetPosition_Done); - AxoSetPosition_Task.ThrowWhen(AxoSetPosition_Error,CONCAT('MC_SetPosition has thrown an error: ', ToString(AxoSetPosition_ErrorID))); + AxoSetPosition_Task.ThrowWhen(AxoSetPosition_Error,CONCAT('<#MC_SetPosition has thrown an error: #>', ToString(AxoSetPosition_ErrorID))); END_IF; //****************************************** @@ -1699,7 +1699,7 @@ NAMESPACE AXOpen.Components.Drives AxoWriteParameter_ErrorID); IF AxoWriteParameter_Task.IsBusy() THEN AxoWriteParameter_Task.DoneWhen(AxoWriteParameter_Done); - AxoWriteParameter_Task.ThrowWhen(AxoWriteParameter_Error,CONCAT('MC_WriteParameter has thrown an error: ', ToString(AxoWriteParameter_ErrorID))); + AxoWriteParameter_Task.ThrowWhen(AxoWriteParameter_Error,CONCAT('<#MC_WriteParameter has thrown an error: #>', ToString(AxoWriteParameter_ErrorID))); END_IF; //****************************************** @@ -1716,7 +1716,7 @@ NAMESPACE AXOpen.Components.Drives AxoWriteRealParameter_ErrorID); IF AxoWriteRealParameter_Task.IsBusy() THEN AxoWriteRealParameter_Task.DoneWhen(AxoWriteRealParameter_Done); - AxoWriteRealParameter_Task.ThrowWhen(AxoWriteRealParameter_Error,CONCAT('MC_WriteRealParameter has thrown an error: ', ToString(AxoWriteRealParameter_ErrorID))); + AxoWriteRealParameter_Task.ThrowWhen(AxoWriteRealParameter_Error,CONCAT('<#MC_WriteRealParameter has thrown an error: #>', ToString(AxoWriteRealParameter_ErrorID))); END_IF; //****************************************** @@ -1733,7 +1733,7 @@ NAMESPACE AXOpen.Components.Drives AxoWriteBoolParameter_ErrorID); IF AxoWriteBoolParameter_Task.IsBusy() THEN AxoWriteBoolParameter_Task.DoneWhen(AxoWriteBoolParameter_Done); - AxoWriteBoolParameter_Task.ThrowWhen(AxoWriteBoolParameter_Error,CONCAT('MC_WriteBoolParameter has thrown an error: ', ToString(AxoWriteBoolParameter_ErrorID))); + AxoWriteBoolParameter_Task.ThrowWhen(AxoWriteBoolParameter_Error,CONCAT('<#MC_WriteBoolParameter has thrown an error: #>', ToString(AxoWriteBoolParameter_ErrorID))); END_IF; //****************************************** @@ -1784,7 +1784,7 @@ NAMESPACE AXOpen.Components.Drives AxoWriteDigitalOutput_ErrorID); IF AxoWriteDigitalOutput_Task.IsBusy() THEN AxoWriteDigitalOutput_Task.DoneWhen(AxoWriteDigitalOutput_Done); - AxoWriteDigitalOutput_Task.ThrowWhen(AxoWriteDigitalOutput_Error,CONCAT('MC_WriteDigitalOutput has thrown an error: ', ToString(AxoWriteDigitalOutput_ErrorID))); + AxoWriteDigitalOutput_Task.ThrowWhen(AxoWriteDigitalOutput_Error,CONCAT('<#MC_WriteDigitalOutput has thrown an error: #>', ToString(AxoWriteDigitalOutput_ErrorID))); END_IF; //****************************************** @@ -1950,7 +1950,7 @@ NAMESPACE AXOpen.Components.Drives AxoReset_ErrorID); IF AxoReset_Task.IsBusy() THEN AxoReset_Task.DoneWhen(AxoReset_Done); - AxoReset_Task.ThrowWhen(AxoReset_Error,CONCAT('MC_Reset has thrown an error: ', ToString(AxoReset_ErrorID))); + AxoReset_Task.ThrowWhen(AxoReset_Error,CONCAT('<#MC_Reset has thrown an error: #>', ToString(AxoReset_ErrorID))); END_IF; //****************************************** diff --git a/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.Designer.cs b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.Designer.cs index 9ff92a14a..6bbb37d57 100644 --- a/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.Designer.cs +++ b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,122 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to MC_Halt has thrown an error: . + /// + public static string MC_UNDERSCORE_Halt_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_Halt_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_Home has thrown an error: . + /// + public static string MC_UNDERSCORE_Home_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_Home_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_MoveAbsolute has thrown an error: . + /// + public static string MC_UNDERSCORE_MoveAbsolute_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_MoveAbsolute_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_MoveAdditive has thrown an error: . + /// + public static string MC_UNDERSCORE_MoveAdditive_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_MoveAdditive_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_MoveRelative has thrown an error: . + /// + public static string MC_UNDERSCORE_MoveRelative_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_MoveRelative_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_MoveVelocity has thrown an error: . + /// + public static string MC_UNDERSCORE_MoveVelocity_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_MoveVelocity_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_Reset has thrown an error: . + /// + public static string MC_UNDERSCORE_Reset_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_Reset_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_SetPosition has thrown an error: . + /// + public static string MC_UNDERSCORE_SetPosition_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_SetPosition_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_TorqueControl has thrown an error: . + /// + public static string MC_UNDERSCORE_TorqueControl_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_TorqueControl_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_WriteBoolParameter has thrown an error: . + /// + public static string MC_UNDERSCORE_WriteBoolParameter_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_WriteBoolParameter_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_WriteDigitalOutput has thrown an error: . + /// + public static string MC_UNDERSCORE_WriteDigitalOutput_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_WriteDigitalOutput_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_WriteParameter has thrown an error: . + /// + public static string MC_UNDERSCORE_WriteParameter_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_WriteParameter_has_thrown_an_error_COLON__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MC_WriteRealParameter has thrown an error: . + /// + public static string MC_UNDERSCORE_WriteRealParameter_has_thrown_an_error_COLON__ { + get { + return ResourceManager.GetString("MC_UNDERSCORE_WriteRealParameter_has_thrown_an_error_COLON__", resourceCulture); + } + } } } diff --git a/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.de.resx b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..8dc56f318 --- /dev/null +++ b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.de.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MCHalt hat einen Fehler ausgelöst: + + + MCHome hat einen Fehler ausgelöst: + + + MCMoveAbsolute hat einen Fehler ausgelöst: + + + MCMoveRelative hat einen Fehler ausgelöst: + + + MCMoveAdditive hat einen Fehler ausgelöst: + + + MCMoveVelocity hat einen Fehler ausgelöst: + + + MCTorqueControl hat einen Fehler ausgelöst: + + + MCSetPosition hat einen Fehler ausgelöst: + + + MCWriteParameter hat einen Fehler ausgelöst: + + + MCWriteRealParameter hat einen Fehler ausgelöst: + + + MCWriteBoolParameter hat einen Fehler ausgelöst: + + + MCWriteDigitalOutput hat einen Fehler ausgelöst: + + + MCReset hat einen Fehler ausgelöst: + + \ No newline at end of file diff --git a/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.es.resx b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..c3d9c7acc --- /dev/null +++ b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.es.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MCHalt ha lanzado un error: + + + MCHome ha lanzado un error: + + + MCMoveAbsolute ha lanzado un error: + + + MCMoveRelative ha lanzado un error: + + + MCMoveAdditive ha lanzado un error: + + + MCMoveVelocity ha lanzado un error: + + + MCTorqueControl ha lanzado un error: + + + MCSetPosition ha arrojado un error: + + + MCWriteParameter ha lanzado un error: + + + MCWriteRealParameter ha arrojado un error: + + + MCWriteBoolParameter ha lanzado un error: + + + MCWriteDigitalOutput ha lanzado un error: + + + MCReset ha lanzado un error: + + \ No newline at end of file diff --git a/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.resx b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.resx index e8ae276d9..60fb627d4 100644 --- a/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.resx +++ b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.resx @@ -58,4 +58,56 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MC_Halt has thrown an error: + src\AxoDrives\AxoDrive.st,1313 + + + MC_Home has thrown an error: + src\AxoDrives\AxoDrive.st,1368 + + + MC_MoveAbsolute has thrown an error: + src\AxoDrives\AxoDrive.st,1412 + + + MC_MoveRelative has thrown an error: + src\AxoDrives\AxoDrive.st,1454 + + + MC_MoveAdditive has thrown an error: + src\AxoDrives\AxoDrive.st,1496 + + + MC_MoveVelocity has thrown an error: + src\AxoDrives\AxoDrive.st,1540 + + + MC_TorqueControl has thrown an error: + src\AxoDrives\AxoDrive.st,1587 + + + MC_SetPosition has thrown an error: + src\AxoDrives\AxoDrive.st,1619 + + + MC_WriteParameter has thrown an error: + src\AxoDrives\AxoDrive.st,1701 + + + MC_WriteRealParameter has thrown an error: + src\AxoDrives\AxoDrive.st,1718 + + + MC_WriteBoolParameter has thrown an error: + src\AxoDrives\AxoDrive.st,1735 + + + MC_WriteDigitalOutput has thrown an error: + src\AxoDrives\AxoDrive.st,1786 + + + MC_Reset has thrown an error: + src\AxoDrives\AxoDrive.st,1952 + \ No newline at end of file diff --git a/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.sk.resx b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..f9c3eae85 --- /dev/null +++ b/src/components.drives/src/AXOpen.Components.Drives/Resources/PlcStringResources.sk.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MCHalt vyhodil chybu: + + + Služba MCHome vyhodila chybu: + + + MCMoveAbsolute vyhodilo chybu: + + + MCMoveRelative vyhodil chybu: + + + MCMoveAdditive vyhodil chybu: + + + MCMoveVelocity vyhodilo chybu: + + + MCTorqueControl vyhodil chybu: + + + Funkcia MCSetPosition vyhodila chybu: + + + MCWriteParameter vyhodil chybu: + + + MCWriteRealParameter vyhodil chybu: + + + MCWriteBoolParameter vyhodil chybu: + + + MCWriteDigitalOutput vyhodil chybu: + + + MCReset vyhodil chybu: + + \ No newline at end of file diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder.st index b1545f1ec..490b9b58c 100644 --- a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder.st +++ b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder.st @@ -910,7 +910,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders ClearErrorTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ClearErrorTask.ThrowWhen(ClearErrorTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ClearErrorTask timeout.'); + ClearErrorTask.ThrowWhen(ClearErrorTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ClearErrorTask timeout.#>'); END_IF; IF ClearErrorTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -1072,7 +1072,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders ChangeWeldingSetupTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ChangeWeldingSetupTask.ThrowWhen(ChangeWeldingSetupTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ChangeWeldingSetupTask timeout.'); + ChangeWeldingSetupTask.ThrowWhen(ChangeWeldingSetupTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ChangeWeldingSetupTask timeout.#>'); END_IF; IF ChangeWeldingSetupTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -1230,7 +1230,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders ChangeWeldingProbeTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ChangeWeldingProbeTask.ThrowWhen(ChangeWeldingProbeTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ChangeWeldingProbeTask timeout.'); + ChangeWeldingProbeTask.ThrowWhen(ChangeWeldingProbeTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ChangeWeldingProbeTask timeout.#>'); END_IF; IF ChangeWeldingProbeTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -1386,7 +1386,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders CycleStopTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - CycleStopTask.ThrowWhen(CycleStopTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'CycleStopTask timeout.'); + CycleStopTask.ThrowWhen(CycleStopTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#CycleStopTask timeout.#>'); END_IF; IF CycleStopTask.DoneReached() THEN Status.Action.Id := UINT#131; @@ -1563,7 +1563,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders RunWeldingWithTimeTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - RunWeldingWithTimeTask.ThrowWhen(RunWeldingWithTimeTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'RunWeldingWithTimeTask timeout.'); + RunWeldingWithTimeTask.ThrowWhen(RunWeldingWithTimeTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#RunWeldingWithTimeTask timeout.#>'); END_IF; IF RunWeldingWithTimeTask.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1716,7 +1716,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders TemplateTask_10steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_6 timeout.'); + TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_6 timeout.#>'); END_IF; IF TemplateTask_10steps_6.DoneReached() THEN Status.Action.Id := UINT#151; @@ -1990,7 +1990,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders TemplateTask_20steps_1.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_1 timeout.'); + TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_1 timeout.#>'); END_IF; IF TemplateTask_20steps_1.DoneReached() THEN Status.Action.Id := UINT#161; @@ -2262,7 +2262,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders THIS.CallTimers(TRUE); TemplateTask_20steps_2.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_2 timeout.'); + TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_2 timeout.#>'); END_IF; IF TemplateTask_20steps_2.DoneReached() THEN Status.Action.Id := UINT#181; @@ -2535,7 +2535,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders TemplateTask_20steps_3.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_3 timeout.'); + TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_3 timeout.#>'); END_IF; IF TemplateTask_20steps_3.DoneReached() THEN Status.Action.Id := UINT#201; @@ -2808,7 +2808,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders TemplateTask_20steps_4.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_4 timeout.'); + TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_4 timeout.#>'); END_IF; IF TemplateTask_20steps_4.DoneReached() THEN Status.Action.Id := UINT#221; @@ -3081,7 +3081,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders TemplateTask_20steps_5.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_5 timeout.'); + TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_5 timeout.#>'); END_IF; IF TemplateTask_20steps_5.DoneReached() THEN Status.Action.Id := UINT#241; @@ -3354,7 +3354,7 @@ NAMESPACE AXOpen.Components.Dukane.Welders TemplateTask_20steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_6 timeout.'); + TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_6 timeout.#>'); END_IF; IF TemplateTask_20steps_6.DoneReached() THEN Status.Action.Id := UINT#261; diff --git a/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.Designer.cs b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.Designer.cs new file mode 100644 index 000000000..9e931c6d9 --- /dev/null +++ b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.Designer.cs @@ -0,0 +1,171 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace AXOpen.Components.Dukane.Welders.Resources { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class PlcStringResources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal PlcStringResources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AXOpen.Components.Dukane.Welders.Resources.PlcStringResources", typeof(PlcStringResources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to ChangeWeldingProbeTask timeout.. + /// + public static string ChangeWeldingProbeTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ChangeWeldingProbeTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ChangeWeldingSetupTask timeout.. + /// + public static string ChangeWeldingSetupTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ChangeWeldingSetupTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ClearErrorTask timeout.. + /// + public static string ClearErrorTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ClearErrorTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CycleStopTask timeout.. + /// + public static string CycleStopTask_timeout_DOT_ { + get { + return ResourceManager.GetString("CycleStopTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RunWeldingWithTimeTask timeout.. + /// + public static string RunWeldingWithTimeTask_timeout_DOT_ { + get { + return ResourceManager.GetString("RunWeldingWithTimeTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_5 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_4 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_1 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_3 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_2 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_", resourceCulture); + } + } + } +} diff --git a/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.de.resx b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..fe19ef4bb --- /dev/null +++ b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.de.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ClearErrorTask Zeitüberschreitung. + + + ChangeWeldingSetupTask Zeitüberschreitung. + + + ChangeWeldingProbeTask Zeitüberschreitung. + + + CycleStopTask Zeitüberschreitung. + + + RunWeldingWithTimeTask Zeitüberschreitung. + + + TemplateTask10steps6 Zeitüberschreitung. + + + TemplateTask20steps1 Zeitüberschreitung. + + + TemplateTask20steps2 Zeitüberschreitung. + + + TemplateTask20steps3 Zeitüberschreitung. + + + TemplateTask20steps4 Zeitüberschreitung. + + + TemplateTask20steps5 Zeitüberschreitung. + + + TemplateTask20steps6 Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.es.resx b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..046a5085b --- /dev/null +++ b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.es.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de ClearErrorTask. + + + Tiempo de espera de ChangeWeldingSetupTask. + + + Tiempo de espera de ChangeWeldingProbeTask. + + + Tiempo de espera de CycleStopTask. + + + Tiempo de espera de RunWeldingWithTimeTask. + + + Tiempo de espera de TemplateTask10steps6. + + + Tiempo de espera de TemplateTask20steps1. + + + Tiempo de espera de TemplateTask20steps2. + + + Tiempo de espera de TemplateTask20steps3. + + + Tiempo de espera de TemplateTask20steps4. + + + Tiempo de espera de TemplateTask20steps5. + + + Tiempo de espera de TemplateTask20steps6. + + \ No newline at end of file diff --git a/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.resx b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.resx new file mode 100644 index 000000000..f76784af4 --- /dev/null +++ b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.resx @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ClearErrorTask timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,912 + + + ChangeWeldingSetupTask timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,1074 + + + ChangeWeldingProbeTask timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,1232 + + + CycleStopTask timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,1388 + + + RunWeldingWithTimeTask timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,1565 + + + TemplateTask_10steps_6 timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,1718 + + + TemplateTask_20steps_1 timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,1992 + + + TemplateTask_20steps_2 timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,2264 + + + TemplateTask_20steps_3 timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,2537 + + + TemplateTask_20steps_4 timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,2810 + + + TemplateTask_20steps_5 timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,3083 + + + TemplateTask_20steps_6 timeout. + src\AxoIQSeriesWelder\Axo_IQ_SeriesWelder.st,3356 + + \ No newline at end of file diff --git a/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.sk.resx b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..fcc3cafed --- /dev/null +++ b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/Resources/PlcStringResources.sk.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit ClearErrorTask. + + + Časový limit ChangeWeldingSetupTask. + + + Časový limit ChangeWeldingProbeTask. + + + Časový limit CycleStopTask. + + + RunWeldingWithTimeTask timeout. + + + TemplateTask10steps6 timeout. + + + TemplateTask20steps1 timeout. + + + TemplateTask20steps2 timeout. + + + TemplateTask20steps3 timeout. + + + TemplateTask20steps4 timeout. + + + TemplateTask20steps5 timeout. + + + TemplateTask20steps6 timeout. + + \ No newline at end of file diff --git a/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/inxton_axopen_components_dukane_welders.csproj b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/inxton_axopen_components_dukane_welders.csproj index b075d99d8..6d6ad1a88 100644 --- a/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/inxton_axopen_components_dukane_welders.csproj +++ b/src/components.dukane.welders/src/AXOpen.Components.Dukane.Welders/inxton_axopen_components_dukane_welders.csproj @@ -63,10 +63,6 @@ - - - - True diff --git a/src/components.elements/ctrl/src/AxoRotaryIndexingTable/AxoRotaryIndexingTable.st b/src/components.elements/ctrl/src/AxoRotaryIndexingTable/AxoRotaryIndexingTable.st index e444c436e..61ff968e3 100644 --- a/src/components.elements/ctrl/src/AxoRotaryIndexingTable/AxoRotaryIndexingTable.st +++ b/src/components.elements/ctrl/src/AxoRotaryIndexingTable/AxoRotaryIndexingTable.st @@ -149,7 +149,7 @@ NAMESPACE AXOpen.Components.Elements //**************************************** //*************TurnTask************** - TurnTask.ThrowWhen(TurnTask.IsBusy() AND NOT inSafetyCondition, 'The safety condition is lost during movement.'); + TurnTask.ThrowWhen(TurnTask.IsBusy() AND NOT inSafetyCondition,'<#The safety condition is lost during movement.#>'); TurnTask.SetIsDisabled(NOT inSafetyCondition OR RestoreTask.IsBusy() OR InitPositionTask.IsBusy()); IF TurnTask.StartTriggered() THEN Status.Action.Id := UINT#100; @@ -249,7 +249,7 @@ NAMESPACE AXOpen.Components.Elements TurnTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TurnTask.ThrowWhen(_timeoutTimer.output,'TurnTask timeout.'); + TurnTask.ThrowWhen(_timeoutTimer.output,'<#TurnTask timeout.#>'); END_IF; IF TurnTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -275,7 +275,7 @@ NAMESPACE AXOpen.Components.Elements //************************************************** //*************InitPositionTask*************** - InitPositionTask.ThrowWhen(InitPositionTask.IsBusy() AND NOT inSafetyCondition, 'The safety condition is lost during movement.'); + InitPositionTask.ThrowWhen(InitPositionTask.IsBusy() AND NOT inSafetyCondition,'<#The safety condition is lost during movement.#>'); InitPositionTask.SetIsDisabled(NOT inSafetyCondition OR RestoreTask.IsBusy() OR TurnTask.IsBusy()); IF InitPositionTask.StartTriggered() THEN Status.Action.Id := UINT#110; @@ -331,7 +331,7 @@ NAMESPACE AXOpen.Components.Elements InitPositionTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - InitPositionTask.ThrowWhen(_timeoutTimer.output ,'InitPositionTask timeout.'); + InitPositionTask.ThrowWhen(_timeoutTimer.output ,'<#InitPositionTask timeout.#>'); END_IF; IF InitPositionTask.DoneReached() THEN Status.Action.Id := UINT#111; diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoAo/AxoAoView.razor b/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoAo/AxoAoView.razor index 2f1afd842..d2e767418 100644 --- a/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoAo/AxoAoView.razor +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoAo/AxoAoView.razor @@ -22,7 +22,7 @@
-

Required Value

+

@Localizer["RequiredValue"]

@RequiredValue.ToString("F2")

[@Component.Units]

diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoDi/AxoDiView.razor b/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoDi/AxoDiView.razor index 57a648368..7aecf7565 100644 --- a/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoDi/AxoDiView.razor +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoDi/AxoDiView.razor @@ -15,8 +15,8 @@
- - + +
@@ -24,8 +24,8 @@
- - + +
@@ -33,7 +33,7 @@
-

Signal

+

@Localizer["Signal"]

@SignalStateLabel

@SignalDetail

@@ -52,15 +52,15 @@ { protected bool IsSignalHigh => Component?._signal?.Cyclic ?? false; - protected string SignalStateLabel => IsSignalHigh ? "Signal HIGH" : "Signal LOW"; + protected string SignalStateLabel => IsSignalHigh ? Localizer["SignalHigh"] : Localizer["SignalLow"]; protected string SignalHint => IsSignalHigh - ? "Positive feedback present" - : "Waiting for positive feedback"; + ? Localizer["PositiveFeedbackPresent"] + : Localizer["WaitingForPositiveFeedback"]; protected string SignalDetail => IsSignalHigh - ? "Input is energized and ready" - : "Input is de-energized"; + ? Localizer["InputIsEnergizedAndReady"] + : Localizer["InputIsDeEnergized"]; protected string SignalBadgeClass => $"badge text-xs font-semibold tracking-wide {(IsSignalHigh ? "badge-success" : "badge-ghost text-slate-400 bg-slate-700/40 border border-slate-500/40")}"; diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoDo/AxoDoView.razor b/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoDo/AxoDoView.razor index bd39fabfe..95bf7ff95 100644 --- a/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoDo/AxoDoView.razor +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoDo/AxoDoView.razor @@ -15,8 +15,8 @@
- - + +
@@ -24,8 +24,8 @@
- - + +
@@ -33,7 +33,7 @@
-

Signal

+

@Localizer["Signal"]

@SignalStateLabel

@SignalDetail

@@ -52,15 +52,15 @@ { protected bool IsSignalHigh => Component?._signal?.Cyclic ?? false; - protected string SignalStateLabel => IsSignalHigh ? "Signal ON" : "Signal OFF"; + protected string SignalStateLabel => IsSignalHigh ? Localizer["SignalOn"] : Localizer["SignalOff"]; protected string SignalHint => IsSignalHigh - ? "Output is active" - : "Output is inactive"; + ? Localizer["OutputIsActive"] + : Localizer["OutputIsInactive"]; protected string SignalDetail => IsSignalHigh - ? "Output is energized" - : "Output is de-energized"; + ? Localizer["OutputIsEnergized"] + : Localizer["OutputIsDeEnergized"]; protected string SignalBadgeClass => $"badge text-xs font-semibold tracking-wide {(IsSignalHigh ? "badge-success" : "badge-ghost text-slate-400 bg-slate-700/40 border border-slate-500/40")}"; diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoRotaryIndexingTable/AxoRotaryIndexingTableView.razor b/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoRotaryIndexingTable/AxoRotaryIndexingTableView.razor index 489a1840f..96d70e466 100644 --- a/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoRotaryIndexingTable/AxoRotaryIndexingTableView.razor +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/AxoRotaryIndexingTable/AxoRotaryIndexingTableView.razor @@ -8,7 +8,7 @@
- Position @CurrentPosition + @Localizer["Position"] @CurrentPosition @* @StatusHint *@ @StatusHint
@@ -16,11 +16,11 @@
- - + +
- +
@@ -28,11 +28,11 @@
- - + +
- +
@@ -41,51 +41,51 @@
-

Current Position

+

@Localizer["CurrentPosition"]

@CurrentPosition
-

Start: @(Component?.Status?.StartPosition?.Cyclic ?? 0)

-

End: @(Component?.Status?.EndPosition?.Cyclic ?? 0)

+

@Localizer["Start"]: @(Component?.Status?.StartPosition?.Cyclic ?? 0)

+

@Localizer["End"]: @(Component?.Status?.EndPosition?.Cyclic ?? 0)

-

Inputs

+

@Localizer["Inputs"]

- Safety Condition + @Localizer["SafetyCondition"]
- In Position + @Localizer["InPosition"]
- In Precise Position + @Localizer["InPrecisePosition"]
- Coding Position: @(Component?.Inputs?.CodingPosition?.Cyclic ?? 0) + @Localizer["CodingPosition"]: @(Component?.Inputs?.CodingPosition?.Cyclic ?? 0)
-

Outputs

+

@Localizer["Outputs"]

- Enable Turn + @Localizer["EnableTurn"]
- Start Turn + @Localizer["StartTurn"]
@@ -121,12 +121,12 @@ { get { - if (!IsSafetyCondition) return "Safety not OK"; - if (IsTurning) return "Turning..."; - if (IsInitializing) return "Initializing..."; - if (IsInPosition && IsInPrecisePosition) return "In precise position"; - if (IsInPosition) return "In position"; - return "Ready"; + if (!IsSafetyCondition) return Localizer["SafetyNotOk"]; + if (IsTurning) return Localizer["Turning"]; + if (IsInitializing) return Localizer["Initializing"]; + if (IsInPosition && IsInPrecisePosition) return Localizer["InPrecisePositionStatus"]; + if (IsInPosition) return Localizer["InPositionStatus"]; + return Localizer["Ready"]; } } diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.cs b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.cs new file mode 100644 index 000000000..db1398094 --- /dev/null +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.cs @@ -0,0 +1,9 @@ +namespace AXOpen.Components.Elements.Resources +{ + /// + /// Marker class for localization resources. + /// + public class Strings + { + } +} diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.de.resx b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.de.resx new file mode 100644 index 000000000..72c6b0f40 --- /dev/null +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.de.resx @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Erforderlicher Wert + + + Erwarten Sie HOCH + + + Erwarten Sie NIEDRIG + + + HIGH-Prüfung + + + LOW-Prüfung + + + Signal + + + Signal HIGH + + + Signal NIEDRIG + + + Positives Feedback vorhanden + + + Warten auf positives Feedback + + + Eingang ist unter Spannung und bereit + + + Eingang ist stromlos + + + Einschalten + + + Ausschalten + + + Signal EIN + + + Signal AUS + + + Ausgang ist aktiv + + + Ausgang ist inaktiv + + + Ausgang ist unter Spannung + + + Ausgang ist stromlos + + + Position + + + Drehen + + + Startposition + + + Wiederherstellen + + + Aktuelle Position + + + Start + + + Ende + + + Eingaben + + + Sicherheitszustand + + + In Position + + + In präziser Position + + + Codierungsposition + + + Ausgaben + + + Aktivieren + + + Start Runde + + + Sicherheit nicht in Ordnung + + + Drehen... + + + Initialisierung... + + + In präziser Position + + + In Position + + + Bereit + + \ No newline at end of file diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.es.resx b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.es.resx new file mode 100644 index 000000000..61a22a837 --- /dev/null +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.es.resx @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Valor requerido + + + Espera ALTO + + + Espera BAJO + + + Comprobación ALTA + + + Comprobación LOW + + + Señal + + + Señal ALTA + + + Señal BAJA + + + Retroalimentación positiva presente + + + A la espera de comentarios positivos + + + La entrada está energizada y lista. + + + La entrada está desenergizada. + + + Encender + + + Apagar + + + Señal activada + + + Señal apagada + + + La salida está activa. + + + La salida está inactiva. + + + La salida está energizada. + + + La salida está desenergizada. + + + Posición + + + Girar + + + Posición inicial + + + Restaurar + + + Posición actual + + + Inicio + + + Fin + + + Entradas + + + Condición de seguridad + + + En posición + + + En posición precisa + + + Posición de codificación + + + Resultados + + + Habilitar Activar + + + Inicio del turno + + + Seguridad no OK + + + Girando... + + + Inicializando... + + + En posición precisa + + + En posición + + + Listo + + \ No newline at end of file diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.resx b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.resx new file mode 100644 index 000000000..69b9ab430 --- /dev/null +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.resx @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Required Value + + + + Expect HIGH + + + Expect LOW + + + HIGH check + + + LOW check + + + Signal + + + Signal HIGH + + + Signal LOW + + + Positive feedback present + + + Waiting for positive feedback + + + Input is energized and ready + + + Input is de-energized + + + + Switch ON + + + Switch OFF + + + Signal ON + + + Signal OFF + + + Output is active + + + Output is inactive + + + Output is energized + + + Output is de-energized + + + + Position + + + Turn + + + Init Position + + + Restore + + + Current Position + + + Start + + + End + + + Inputs + + + Safety Condition + + + In Position + + + In Precise Position + + + Coding Position + + + Outputs + + + Enable Turn + + + Start Turn + + + Safety not OK + + + Turning... + + + Initializing... + + + In precise position + + + In position + + + Ready + + diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.sk.resx b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.sk.resx new file mode 100644 index 000000000..64081dd35 --- /dev/null +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/Resources/Strings.sk.resx @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Signál VYPNUTÝ + + + Požadovaná hodnota + + + Očakávajte VYSOKÚ + + + Očakávajte NÍZKU + + + Kontrola HIGH + + + Kontrola LOW + + + Signál + + + Signál HIGH + + + Signál LOW + + + Prítomná pozitívna spätná väzba + + + Čakanie na pozitívnu spätnú väzbu + + + Vstup je pod napätím a pripravený + + + Vstup je bez napájania + + + Zapnúť + + + Vypnúť + + + Signál zapnutý + + + Výstup je aktívny + + + Výstup je neaktívny + + + Výstup je pod napätím + + + Výstup je bez napätia + + + Pozícia + + + Otočte + + + Počiatočná pozícia + + + Obnoviť + + + Aktuálna pozícia + + + Začať + + + Koniec + + + Vstupy + + + Bezpečnostné podmienky + + + V polohe + + + V presnej polohe + + + Pozícia kódovania + + + Výstupy + + + Povoliť otočenie + + + Začiatok ťahu + + + Bezpečnosť nie je v poriadku + + + Otáčanie... + + + Inicializácia... + + + V presnej polohe + + + V polohe + + + Pripravený + + \ No newline at end of file diff --git a/src/components.elements/src/AXOpen.Components.Elements.blazor/_Imports.razor b/src/components.elements/src/AXOpen.Components.Elements.blazor/_Imports.razor index aee648c0f..7dedce1f7 100644 --- a/src/components.elements/src/AXOpen.Components.Elements.blazor/_Imports.razor +++ b/src/components.elements/src/AXOpen.Components.Elements.blazor/_Imports.razor @@ -1,6 +1,10 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Authorization +@using Microsoft.Extensions.Localization @using AXOpen.Core @using AXOpen.Core.Blazor @using AXSharp.Presentation.Blazor.Controls @using AXSharp.Presentation.Blazor.Controls.RenderableContent +@using AXOpen.Components.Elements.Resources + +@inject IStringLocalizer Localizer diff --git a/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.Designer.cs b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.Designer.cs index 85054ca6d..d453f5387 100644 --- a/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.Designer.cs +++ b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,32 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to InitPositionTask timeout.. + /// + public static string InitPositionTask_timeout_DOT_ { + get { + return ResourceManager.GetString("InitPositionTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The safety condition is lost during movement.. + /// + public static string The_safety_condition_is_lost_during_movement_DOT_ { + get { + return ResourceManager.GetString("The_safety_condition_is_lost_during_movement_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TurnTask timeout.. + /// + public static string TurnTask_timeout_DOT_ { + get { + return ResourceManager.GetString("TurnTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.de.resx b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..0e9e73def --- /dev/null +++ b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.de.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Der Sicherheitszustand geht während der Bewegung verloren. + + + TurnTask Zeitüberschreitung. + + + InitPositionTask Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.es.resx b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..b0b2d7f71 --- /dev/null +++ b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.es.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + La condición de seguridad se pierde durante el movimiento. + + + Tiempo de espera de TurnTask. + + + Tiempo de espera de InitPositionTask. + + \ No newline at end of file diff --git a/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.resx b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.resx index e8ae276d9..433818165 100644 --- a/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.resx +++ b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.resx @@ -58,4 +58,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + The safety condition is lost during movement. + src\AxoRotaryIndexingTable\AxoRotaryIndexingTable.st,151 + + + TurnTask timeout. + src\AxoRotaryIndexingTable\AxoRotaryIndexingTable.st,251 + + + InitPositionTask timeout. + src\AxoRotaryIndexingTable\AxoRotaryIndexingTable.st,333 + \ No newline at end of file diff --git a/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.sk.resx b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..10aa9fbc6 --- /dev/null +++ b/src/components.elements/src/AXOpen.Components.Elements/Resources/PlcStringResources.sk.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bezpečnostná podmienka sa počas pohybu stráca. + + + Časový limit TurnTask. + + + Časový limit úlohy InitPositionTask. + + \ No newline at end of file diff --git a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/AxoCmmtAs/AxoCmmtAsView.razor b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/AxoCmmtAs/AxoCmmtAsView.razor index f21e77584..c17c50840 100644 --- a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/AxoCmmtAs/AxoCmmtAsView.razor +++ b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/AxoCmmtAs/AxoCmmtAsView.razor @@ -10,15 +10,15 @@ @DriveStateLabel @CurrentMotionTaskLabel
- Position + @Localizer["Position"] @FormattedPosition
- Velocity + @Localizer["Velocity"] @FormattedVelocity
- Torque + @Localizer["Torque"] @FormattedTorque
@@ -28,13 +28,13 @@
-
Power & safety
-

Enable the power stage, toggle brakes and trigger controlled stops.

+
@Localizer["PowerAndSafety"]
+

@Localizer["PowerAndSafetyDescription"]

- - - + + +
@@ -48,13 +48,13 @@
-
Homing & referencing
-

Align the axis, set offsets and manage override factors.

+
@Localizer["HomingAndReferencing"]
+

@Localizer["HomingAndReferencingDescription"]

- - - + + +
@@ -72,13 +72,13 @@
-
Discrete motion
-

Execute absolute, relative or additive positioning moves.

+
@Localizer["DiscreteMotion"]
+

@Localizer["DiscreteMotionDescription"]

- - - + + +
@@ -98,12 +98,12 @@
-
Continuous motion & torque
-

Manage velocity mode and torque-controlled moves.

+
@Localizer["ContinuousMotionAndTorque"]
+

@Localizer["ContinuousMotionDescription"]

- - + +
@@ -125,13 +125,13 @@
-
Power & safety
-

Live feedback when manual control is disabled.

+
@Localizer["PowerAndSafety"]
+

@Localizer["LiveFeedbackDescription"]

- - - + + +
@@ -145,13 +145,13 @@
-
Homing & referencing
-

Monitor reference tasks, offsets and override factors.

+
@Localizer["HomingAndReferencing"]
+

@Localizer["MonitorReferencingDescription"]

- - - + + +
@@ -169,13 +169,13 @@
-
Discrete motion
-

Command queues, feed rates and progress of traversing moves.

+
@Localizer["DiscreteMotion"]
+

@Localizer["DiscreteMotionMonitorDescription"]

- - - + + +
@@ -195,12 +195,12 @@
-
Continuous motion & torque
-

Observe velocity and torque control loops.

+
@Localizer["ContinuousMotionAndTorque"]
+

@Localizer["ContinuousMotionMonitorDescription"]

- - + +
@@ -222,8 +222,8 @@
-
Drive feedback
-

Status bits, active tasks and current diagnostics.

+
@Localizer["DriveFeedback"]
+

@Localizer["DriveFeedbackDescription"]

@@ -236,8 +236,8 @@
-
Scaling constants
-

Realtime factors calculated from PROFIdrive parameters.

+
@Localizer["ScalingConstants"]
+

@Localizer["ScalingConstantsDescription"]

@@ -257,8 +257,8 @@
-
Axis reference
-

Inspect telegrams, hardware IDs and cached axis data.

+
@Localizer["AxisReference"]
+

@Localizer["AxisReferenceDescription"]

@@ -280,15 +280,15 @@ @* @CurrentMotionTaskLabel *@
-

Position

+

@Localizer["Position"]

@FormattedPosition
-

Velocity

+

@Localizer["Velocity"]

@FormattedVelocity
-

Torque

+

@Localizer["Torque"]

@FormattedTorque
diff --git a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.cs b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.cs new file mode 100644 index 000000000..6f4e35690 --- /dev/null +++ b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.cs @@ -0,0 +1,9 @@ +namespace AXOpen.Components.Festo.Drives.Resources +{ + /// + /// Marker class for localization resources. + /// + public class Strings + { + } +} diff --git a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.de.resx b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.de.resx new file mode 100644 index 000000000..4a9701d8d --- /dev/null +++ b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.de.resx @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Position + + + Geschwindigkeit + + + Drehmoment + + + Leistung und Sicherheit + + + Aktivieren Sie die Leistungsstufe, schalten Sie die Bremsen um und lösen Sie kontrollierte Stopps aus. + + + Leistungsstufe + + + Kontrollierter Stopp + + + Halt + + + Homing & Referenzierung + + + Achse ausrichten, Versätze einstellen und Übersteuerungsfaktoren verwalten. + + + Startseite + + + Position einstellen + + + Überschreiben + + + Diskrete Bewegung + + + Führen Sie absolute, relative oder additive Positionierungsbewegungen aus. + + + Absolut verschieben + + + Relativ verschieben + + + Additiv verschieben + + + Kontinuierliche Bewegung und Drehmoment + + + Geschwindigkeitsmodus und drehmomentgesteuerte Bewegungen verwalten. + + + Geschwindigkeit + + + Drehmomentregelung + + + Live-Feedback, wenn die manuelle Steuerung deaktiviert ist. + + + Überwachen Sie Referenzaufgaben, Offsets und Übersteuerungsfaktoren. + + + Befehlswarteschlangen, Vorschubgeschwindigkeiten und Fortschritt von Traversierbewegungen. + + + Beobachten Sie die Geschwindigkeits- und Drehmomentregelkreise. + + + Antriebsrückmeldung + + + Statusbits, aktive Aufgaben und aktuelle Diagnosen. + + + Skalierungskonstanten + + + Aus PROFIdrive-Parametern berechnete Echtzeitfaktoren. + + + Achsenbezug + + + Telegramme, Hardware-IDs und zwischengespeicherte Achsdaten überprüfen. + + + Unbekannt + + + Keine Aufgabe + + + mm + + + mm/s + + + Nm + + \ No newline at end of file diff --git a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.es.resx b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.es.resx new file mode 100644 index 000000000..d6d1345aa --- /dev/null +++ b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.es.resx @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Posición + + + Velocidad + + + Par motor + + + Potencia y seguridad + + + Activa la etapa de potencia, acciona los frenos y activa las paradas controladas. + + + Etapa de potencia + + + Parada controlada + + + Alto + + + Orientación y referencia + + + Alinee el eje, establezca compensaciones y gestione los factores de anulación. + + + Inicio + + + Posición establecida + + + Anular + + + Movimiento discreto + + + Ejecutar movimientos de posicionamiento absolutos, relativos o aditivos. + + + Movimiento absoluto + + + Mover relativo + + + Mover aditivo + + + Movimiento continuo y par motor + + + Gestiona el modo de velocidad y los movimientos controlados por par. + + + Velocidad + + + Control del par motor + + + Retroalimentación en vivo cuando el control manual está desactivado. + + + Supervisar las tareas de referencia, las compensaciones y los factores de anulación. + + + Colas de comandos, velocidades de avance y progreso de los movimientos transversales. + + + Observe los bucles de control de velocidad y par. + + + Retroalimentación de la unidad + + + Bits de estado, tareas activas y diagnósticos actuales. + + + Constantes de escala + + + Factores en tiempo real calculados a partir de los parámetros PROFIdrive. + + + Referencia del eje + + + Inspeccione telegramas, identificadores de hardware y datos de ejes almacenados en caché. + + + Desconocido + + + Sin tarea + + + mm + + + mm/s + + + Nm + + \ No newline at end of file diff --git a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.resx b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.resx new file mode 100644 index 000000000..c37163168 --- /dev/null +++ b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.resx @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Position + + + Velocity + + + Torque + + + + Power & safety + + + Enable the power stage, toggle brakes and trigger controlled stops. + + + Power stage + + + Controlled stop + + + Halt + + + + Homing & referencing + + + Align the axis, set offsets and manage override factors. + + + Home + + + Set position + + + Override + + + + Discrete motion + + + Execute absolute, relative or additive positioning moves. + + + Move absolute + + + Move relative + + + Move additive + + + + Continuous motion & torque + + + Manage velocity mode and torque-controlled moves. + + + Velocity + + + Torque control + + + + Live feedback when manual control is disabled. + + + Monitor reference tasks, offsets and override factors. + + + Command queues, feed rates and progress of traversing moves. + + + Observe velocity and torque control loops. + + + + Drive feedback + + + Status bits, active tasks and current diagnostics. + + + + Scaling constants + + + Realtime factors calculated from PROFIdrive parameters. + + + + Axis reference + + + Inspect telegrams, hardware IDs and cached axis data. + + + + Unknown + + + No task + + + + mm + + + mm/s + + + Nm + + diff --git a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.sk.resx b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.sk.resx new file mode 100644 index 000000000..dfc94a59f --- /dev/null +++ b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/Resources/Strings.sk.resx @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Aktivujte výkonovú fázu, prepínajte brzdy a spúšťajte kontrolované zastavenia. + + + Pozícia + + + Rýchlosť + + + Krútiaci moment + + + Výkon a bezpečnosť + + + Výkonová fáza + + + Kontrolované zastavenie + + + Zastaviť + + + Navádzanie a referencovanie + + + Vyrovnajte os, nastavte posuny a spravujte faktory prepisovania. + + + Domov + + + Nastaviť polohu + + + Prepísať + + + Diskrétny pohyb + + + Vykonávajte absolútne, relatívne alebo aditívne polohovacie pohyby. + + + Absolútny pohyb + + + Presun relatívny + + + Presun prísady + + + Neustály pohyb a krútiaci moment + + + Riadenie režimu rýchlosti a pohybov riadených krútiacim momentom. + + + Rýchlosť + + + Kontrola krútiaceho momentu + + + Živá spätná väzba, keď je manuálne ovládanie vypnuté. + + + Monitorujte referenčné úlohy, kompenzácie a faktory prepisovania. + + + Odosielanie príkazov, rýchlosť posuvu a priebeh pohybov. + + + Sledujte regulačné slučky rýchlosti a krútiaceho momentu. + + + Spätná väzba od vodiča + + + Stavové bity, aktívne úlohy a aktuálna diagnostika. + + + Konštanty škálovania + + + Faktory v reálnom čase vypočítané z parametrov PROFIdrive. + + + Referenčná os + + + Skontrolujte telegramy, identifikátory hardvéru a údaje o osiach uložené v pamäti cache. + + + Neznámy + + + Žiadna úloha + + + mm + + + mm/s + + + Nm + + \ No newline at end of file diff --git a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/_Imports.razor b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/_Imports.razor index 631239474..3482c8155 100644 --- a/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/_Imports.razor +++ b/src/components.festo.drives/src/AXOpen.Components.Festo.Drives.blazor/_Imports.razor @@ -1,7 +1,11 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Authorization +@using Microsoft.Extensions.Localization @using AXOpen.Core @using AXOpen.Messaging @using AXOpen.Messaging.Static @using AXSharp.Presentation.Blazor.Controls -@using AXSharp.Presentation.Blazor.Controls.RenderableContent \ No newline at end of file +@using AXSharp.Presentation.Blazor.Controls.RenderableContent +@using AXOpen.Components.Festo.Drives.Resources + +@inject IStringLocalizer Localizer \ No newline at end of file diff --git a/src/components.keyence.vision/ctrl/src/Axo_IV3/Axo_IV3.st b/src/components.keyence.vision/ctrl/src/Axo_IV3/Axo_IV3.st index 62eec0227..3152d35de 100644 --- a/src/components.keyence.vision/ctrl/src/Axo_IV3/Axo_IV3.st +++ b/src/components.keyence.vision/ctrl/src/Axo_IV3/Axo_IV3.st @@ -6248,7 +6248,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TriggerTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TriggerTask.ThrowWhen(TriggerTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TriggerTask timeout.'); + TriggerTask.ThrowWhen(TriggerTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TriggerTask timeout.#>'); END_IF; IF TriggerTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -6419,10 +6419,10 @@ NAMESPACE AXOpen.Components.Keyence.Vision THIS.CallTimers(TRUE); - ChangeProgramTask.ThrowWhen(Inputs.CommandStatusBits.ProgramSwitchingFailed,'Attempt to change the program failed.'); + ChangeProgramTask.ThrowWhen(Inputs.CommandStatusBits.ProgramSwitchingFailed,'<#Attempt to change the program failed.#>'); ChangeProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ChangeProgramTask.ThrowWhen(ChangeProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ChangeProgramTask timeout.'); + ChangeProgramTask.ThrowWhen(ChangeProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ChangeProgramTask timeout.#>'); END_IF; IF ChangeProgramTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -6575,7 +6575,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_10steps_3.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_3.ThrowWhen(TemplateTask_10steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_3 timeout.'); + TemplateTask_10steps_3.ThrowWhen(TemplateTask_10steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_3 timeout.#>'); END_IF; IF TemplateTask_10steps_3.DoneReached() THEN Status.Action.Id := UINT#121; @@ -6728,7 +6728,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_10steps_4.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_4.ThrowWhen(TemplateTask_10steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_4 timeout.'); + TemplateTask_10steps_4.ThrowWhen(TemplateTask_10steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_4 timeout.#>'); END_IF; IF TemplateTask_10steps_4.DoneReached() THEN Status.Action.Id := UINT#131; @@ -6881,7 +6881,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_10steps_5.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_5.ThrowWhen(TemplateTask_10steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_5 timeout.'); + TemplateTask_10steps_5.ThrowWhen(TemplateTask_10steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_5 timeout.#>'); END_IF; IF TemplateTask_10steps_5.DoneReached() THEN Status.Action.Id := UINT#141; @@ -7034,7 +7034,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_10steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_6 timeout.'); + TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_6 timeout.#>'); END_IF; IF TemplateTask_10steps_6.DoneReached() THEN Status.Action.Id := UINT#151; @@ -7308,7 +7308,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_20steps_1.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_1 timeout.'); + TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_1 timeout.#>'); END_IF; IF TemplateTask_20steps_1.DoneReached() THEN Status.Action.Id := UINT#161; @@ -7580,7 +7580,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision THIS.CallTimers(TRUE); TemplateTask_20steps_2.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_2 timeout.'); + TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_2 timeout.#>'); END_IF; IF TemplateTask_20steps_2.DoneReached() THEN Status.Action.Id := UINT#181; @@ -7853,7 +7853,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_20steps_3.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_3 timeout.'); + TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_3 timeout.#>'); END_IF; IF TemplateTask_20steps_3.DoneReached() THEN Status.Action.Id := UINT#201; @@ -8126,7 +8126,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_20steps_4.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_4 timeout.'); + TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_4 timeout.#>'); END_IF; IF TemplateTask_20steps_4.DoneReached() THEN Status.Action.Id := UINT#221; @@ -8399,7 +8399,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_20steps_5.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_5 timeout.'); + TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_5 timeout.#>'); END_IF; IF TemplateTask_20steps_5.DoneReached() THEN Status.Action.Id := UINT#241; @@ -8672,7 +8672,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TemplateTask_20steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_6 timeout.'); + TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_6 timeout.#>'); END_IF; IF TemplateTask_20steps_6.DoneReached() THEN Status.Action.Id := UINT#261; diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000.st index 26a157145..1084fb673 100644 --- a/src/components.keyence.vision/ctrl/src/Axo_SR_1000.st +++ b/src/components.keyence.vision/ctrl/src/Axo_SR_1000.st @@ -1288,7 +1288,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision ClearResultDataTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ClearResultDataTask.ThrowWhen(ClearResultDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ClearResultDataTask timeout.'); + ClearResultDataTask.ThrowWhen(ClearResultDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ClearResultDataTask timeout.#>'); END_IF; IF ClearResultDataTask.DoneReached() THEN Status.Action.Id := UINT#131; @@ -1479,7 +1479,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision THIS.CallTimers(FALSE); _progress := 390; ELSE - ReadTask.ThrowWhen(TRUE,'ErrorStatus.ReadFailure'); + ReadTask.ThrowWhen(TRUE,'<#ErrorStatus.ReadFailure#>'); END_IF; END_IF; END_IF; @@ -1595,7 +1595,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision ReadTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadTask timeout.'); + ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadTask timeout.#>'); END_IF; IF ReadTask.DoneReached() THEN Status.Action.Id := UINT#181; @@ -1785,7 +1785,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision IF NOT ErrorStatus.TuneFailure THEN _progress := 410; ELSE - TuneTask.ThrowWhen(TRUE,'ErrorStatus.TuneFailure'); + TuneTask.ThrowWhen(TRUE,'<#ErrorStatus.TuneFailure#>'); END_IF; END_IF; END_IF; @@ -1900,7 +1900,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TuneTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TuneTask.ThrowWhen(TuneTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TuneTask timeout.'); + TuneTask.ThrowWhen(TuneTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TuneTask timeout.#>'); END_IF; IF TuneTask.DoneReached() THEN Status.Action.Id := UINT#201; diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750.st index 37804d44f..3d4c84c06 100644 --- a/src/components.keyence.vision/ctrl/src/Axo_SR_750.st +++ b/src/components.keyence.vision/ctrl/src/Axo_SR_750.st @@ -1284,7 +1284,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision ClearResultDataTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ClearResultDataTask.ThrowWhen(ClearResultDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ClearResultDataTask timeout.'); + ClearResultDataTask.ThrowWhen(ClearResultDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ClearResultDataTask timeout.#>'); END_IF; IF ClearResultDataTask.DoneReached() THEN Status.Action.Id := UINT#131; @@ -1475,7 +1475,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision THIS.CallTimers(FALSE); _progress := 390; ELSE - ReadTask.ThrowWhen(TRUE,'ErrorStatus.ReadFailure'); + ReadTask.ThrowWhen(TRUE,'<#ErrorStatus.ReadFailure#>'); END_IF; END_IF; END_IF; @@ -1591,7 +1591,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision ReadTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadTask timeout.'); + ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadTask timeout.#>'); END_IF; IF ReadTask.DoneReached() THEN Status.Action.Id := UINT#181; @@ -1781,7 +1781,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision IF NOT ErrorStatus.TuneFailure THEN _progress := 410; ELSE - TuneTask.ThrowWhen(TRUE,'ErrorStatus.TuneFailure'); + TuneTask.ThrowWhen(TRUE,'<#ErrorStatus.TuneFailure#>'); END_IF; END_IF; END_IF; @@ -1896,7 +1896,7 @@ NAMESPACE AXOpen.Components.Keyence.Vision TuneTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TuneTask.ThrowWhen(TuneTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TuneTask timeout.'); + TuneTask.ThrowWhen(TuneTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TuneTask timeout.#>'); END_IF; IF TuneTask.DoneReached() THEN Status.Action.Id := UINT#201; diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Axo_IV3/Axo_IV3ImageView.razor b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Axo_IV3/Axo_IV3ImageView.razor index 60b186680..5218f4959 100644 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Axo_IV3/Axo_IV3ImageView.razor +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Axo_IV3/Axo_IV3ImageView.razor @@ -14,20 +14,20 @@ style="width:100%; height:100%; border:none; pointer-events: none;" scrolling="no" loading="lazy" - title="External site"> + title="@Localizer["ExternalSite"]">
} else if (_isLoading) {
-

Loading...

+

@Localizer["Loading"]

} else {
-

Failed to load content

+

@Localizer["FailedToLoadContent"]

}
diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Axo_IV3/Axo_IV3View.razor b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Axo_IV3/Axo_IV3View.razor index 96400f142..00fd9fe57 100644 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Axo_IV3/Axo_IV3View.razor +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Axo_IV3/Axo_IV3View.razor @@ -6,17 +6,17 @@ - @(HasResult ? "New result" : "Waiting") + @(HasResult ? Localizer["NewResult"] : Localizer["Waiting"]) - @(LastResultOk ? "OK" : LastResultNg ? "NG" : "---") + @(LastResultOk ? Localizer["Ok"] : LastResultNg ? Localizer["Ng"] : "---")
- Cycle progress + @Localizer["CycleProgress"] @ProgressPercentage%
@@ -24,25 +24,25 @@
- Ready - Busy - Imaging - Trigger ready - Warning - Error - Result available + @Localizer["Ready"] + @Localizer["Busy"] + @Localizer["Imaging"] + @Localizer["TriggerReady"] + @Localizer["Warning"] + @Localizer["Error"] + @Localizer["ResultAvailable"]
- +
@@ -51,38 +51,38 @@
-
Program control
- Current @CurrentProgramNumber +
@Localizer["ProgramControl"]
+ @Localizer["Current"] @CurrentProgramNumber
- Result No. + @Localizer["ResultNo"]
@Component.Inputs.DeviceStatusWords.ResultNo.Cyclic
- Program during shot + @Localizer["ProgramDuringShot"]
@Component.Inputs.DeviceStatusWords.ProgramNoDuringJudgment.Cyclic
- +
@@ -100,7 +100,7 @@
- Cycle progress + @Localizer["CycleProgress"] @ProgressPercentage%
@@ -108,13 +108,13 @@
- Ready - Busy - Imaging - Trigger ready - Warning - Error - Result available + @Localizer["Ready"] + @Localizer["Busy"] + @Localizer["Imaging"] + @Localizer["TriggerReady"] + @Localizer["Warning"] + @Localizer["Error"] + @Localizer["ResultAvailable"]
@@ -125,18 +125,18 @@
-
Program control
- Current @CurrentProgramNumber +
@Localizer["ProgramControl"]
+ @Localizer["Current"] @CurrentProgramNumber
- Result No. + @Localizer["ResultNo"]
@Component.Inputs.DeviceStatusWords.ResultNo.Cyclic
- Program during shot + @Localizer["ProgramDuringShot"]
@Component.Inputs.DeviceStatusWords.ProgramNoDuringJudgment.Cyclic
diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.cs b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.cs new file mode 100644 index 000000000..d30bbcfe5 --- /dev/null +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.cs @@ -0,0 +1,9 @@ +namespace AXOpen.Components.Keyence.Vision.Resources +{ + /// + /// Marker class for localization resources. + /// + public class Strings + { + } +} diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.de.resx b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.de.resx new file mode 100644 index 000000000..271ba115d --- /dev/null +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.de.resx @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Neues Ergebnis + + + Warten + + + OK + + + NG + + + Zyklusfortschritt + + + Bereit + + + Beschäftigt + + + Bildgebung + + + Auslöser bereit + + + Warnung + + + Fehler + + + Ergebnis verfügbar + + + Steuerungen + + + Auslöser + + + Wiederherstellen + + + Programmsteuerung + + + Aktuell + + + Änderungsprogramm + + + Ergebnis Nr. + + + Programm während der Aufnahme + + + Bild + + + Wird geladen... + + + Inhalt konnte nicht geladen werden + + + Externe Website + + \ No newline at end of file diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.es.resx b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.es.resx new file mode 100644 index 000000000..de36235b4 --- /dev/null +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.es.resx @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Nuevo resultado + + + Esperando + + + De acuerdo. + + + NG + + + Progreso del ciclo + + + Listo + + + Ocupado + + + Imágenes + + + Gatillo listo + + + Advertencia + + + Error + + + Resultado disponible + + + Controles + + + Gatillo + + + Restaurar + + + Control del programa + + + Actual + + + Programa de cambio + + + Resultado n.º + + + Programa durante la toma + + + Imagen + + + Cargando... + + + No se ha podido cargar el contenido. + + + Sitio externo + + \ No newline at end of file diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.resx b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.resx new file mode 100644 index 000000000..6e709da60 --- /dev/null +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + New result + + + Waiting + + + OK + + + NG + + + Cycle progress + + + Ready + + + Busy + + + Imaging + + + Trigger ready + + + Warning + + + Error + + + Result available + + + Controls + + + Trigger + + + Restore + + + Program control + + + Current + + + Change Program + + + Result No. + + + Program during shot + + + Image + + + + Loading... + + + Failed to load content + + + External site + + diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.sk.resx b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.sk.resx new file mode 100644 index 000000000..ad845efe5 --- /dev/null +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/Resources/Strings.sk.resx @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Nový výsledok + + + Čakanie + + + OK + + + NG + + + Postup cyklu + + + Pripravený + + + Zaneprázdnený + + + Zobrazovanie + + + Spúšť pripravená + + + Upozornenie + + + Chyba + + + Výsledok k dispozícii + + + Ovládacie prvky + + + Spúšť + + + Obnoviť + + + Ovládanie programu + + + Súčasný + + + Zmena programu + + + Výsledok č. + + + Program počas záberu + + + Obrázok + + + Načítava sa... + + + Nepodarilo sa načítať obsah + + + Externá stránka + + \ No newline at end of file diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/_Imports.razor b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/_Imports.razor index 061398d16..50b0b388d 100644 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/_Imports.razor +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision.blazor/_Imports.razor @@ -1,3 +1,7 @@ @using Microsoft.AspNetCore.Components.Web +@using Microsoft.Extensions.Localization @using AXSharp.Presentation.Blazor.Controls.RenderableContent -@using Microsoft.AspNetCore.Components.Authorization \ No newline at end of file +@using Microsoft.AspNetCore.Components.Authorization +@using AXOpen.Components.Keyence.Vision.Resources + +@inject IStringLocalizer Localizer \ No newline at end of file diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.Designer.cs b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.Designer.cs index 450941601..7368d9781 100644 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.Designer.cs +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,167 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to Attempt to change the program failed.. + /// + public static string Attempt_to_change_the_program_failed_DOT_ { + get { + return ResourceManager.GetString("Attempt_to_change_the_program_failed_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ChangeProgramTask timeout.. + /// + public static string ChangeProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ChangeProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ClearResultDataTask timeout.. + /// + public static string ClearResultDataTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ClearResultDataTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ErrorStatus.ReadFailure. + /// + public static string ErrorStatus_DOT_ReadFailure { + get { + return ResourceManager.GetString("ErrorStatus_DOT_ReadFailure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ErrorStatus.TuneFailure. + /// + public static string ErrorStatus_DOT_TuneFailure { + get { + return ResourceManager.GetString("ErrorStatus_DOT_TuneFailure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReadTask timeout.. + /// + public static string ReadTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ReadTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_5 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_4 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_3 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_5 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_4 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_1 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_3 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_2 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TriggerTask timeout.. + /// + public static string TriggerTask_timeout_DOT_ { + get { + return ResourceManager.GetString("TriggerTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TuneTask timeout.. + /// + public static string TuneTask_timeout_DOT_ { + get { + return ResourceManager.GetString("TuneTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.de.resx b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..005ff88d5 --- /dev/null +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.de.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ClearResultDataTask Zeitüberschreitung. + + + ErrorStatus.ReadFailure + + + ReadTask Zeitüberschreitung. + + + ErrorStatus.TuneFailure + + + TuneTask-Zeitüberschreitung. + + + TriggerTask-Zeitüberschreitung. + + + Der Versuch, das Programm zu ändern, ist fehlgeschlagen. + + + ChangeProgramTask Zeitüberschreitung. + + + TemplateTask10steps3 Zeitüberschreitung. + + + TemplateTask10steps4 Zeitüberschreitung. + + + TemplateTask10steps5 Zeitüberschreitung. + + + TemplateTask10steps6 Zeitüberschreitung. + + + TemplateTask20steps1 Zeitüberschreitung. + + + TemplateTask20steps2 Zeitüberschreitung. + + + TemplateTask20steps3 Zeitüberschreitung. + + + TemplateTask20steps4 Zeitüberschreitung. + + + TemplateTask20steps5 Zeitüberschreitung. + + + TemplateTask20steps6 Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.es.resx b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..27feb3c0d --- /dev/null +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.es.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de ClearResultDataTask. + + + ErrorStatus.ReadFailure + + + Tiempo de espera de ReadTask. + + + ErrorStatus.TuneFailure + + + Tiempo de espera de TuneTask. + + + Tiempo de espera de TriggerTask. + + + El intento de cambiar el programa ha fallado. + + + Tiempo de espera de ChangeProgramTask. + + + Tiempo de espera de TemplateTask10steps3. + + + Tiempo de espera de TemplateTask10steps4. + + + Tiempo de espera de TemplateTask10steps5. + + + Tiempo de espera de TemplateTask10steps6. + + + Tiempo de espera de TemplateTask20steps1. + + + Tiempo de espera de TemplateTask20steps2. + + + Tiempo de espera de TemplateTask20steps3. + + + Tiempo de espera de TemplateTask20steps4. + + + Tiempo de espera de TemplateTask20steps5. + + + Tiempo de espera de TemplateTask20steps6. + + \ No newline at end of file diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.resx b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.resx index e8ae276d9..f7e7644e5 100644 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.resx +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.resx @@ -58,4 +58,76 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ClearResultDataTask timeout. + src\Axo_SR_1000.st,1290 + + + ErrorStatus.ReadFailure + src\Axo_SR_1000.st,1481 + + + ReadTask timeout. + src\Axo_SR_1000.st,1597 + + + ErrorStatus.TuneFailure + src\Axo_SR_1000.st,1787 + + + TuneTask timeout. + src\Axo_SR_1000.st,1902 + + + TriggerTask timeout. + src\Axo_IV3\Axo_IV3.st,6250 + + + Attempt to change the program failed. + src\Axo_IV3\Axo_IV3.st,6421 + + + ChangeProgramTask timeout. + src\Axo_IV3\Axo_IV3.st,6424 + + + TemplateTask_10steps_3 timeout. + src\Axo_IV3\Axo_IV3.st,6577 + + + TemplateTask_10steps_4 timeout. + src\Axo_IV3\Axo_IV3.st,6730 + + + TemplateTask_10steps_5 timeout. + src\Axo_IV3\Axo_IV3.st,6883 + + + TemplateTask_10steps_6 timeout. + src\Axo_IV3\Axo_IV3.st,7036 + + + TemplateTask_20steps_1 timeout. + src\Axo_IV3\Axo_IV3.st,7310 + + + TemplateTask_20steps_2 timeout. + src\Axo_IV3\Axo_IV3.st,7582 + + + TemplateTask_20steps_3 timeout. + src\Axo_IV3\Axo_IV3.st,7855 + + + TemplateTask_20steps_4 timeout. + src\Axo_IV3\Axo_IV3.st,8128 + + + TemplateTask_20steps_5 timeout. + src\Axo_IV3\Axo_IV3.st,8401 + + + TemplateTask_20steps_6 timeout. + src\Axo_IV3\Axo_IV3.st,8674 + \ No newline at end of file diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.sk.resx b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..e908105f2 --- /dev/null +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Resources/PlcStringResources.sk.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit ClearResultDataTask. + + + ErrorStatus.ReadFailure + + + Časový limit ReadTask. + + + ErrorStatus.TuneFailure + + + Časový limit TuneTask. + + + Časový limit TriggerTask. + + + Pokus o zmenu programu zlyhal. + + + Časový limit ChangeProgramTask. + + + TemplateTask10steps3 timeout. + + + TemplateTask10steps4 timeout. + + + TemplateTask10steps5 timeout. + + + TemplateTask10steps6 timeout. + + + TemplateTask20steps1 timeout. + + + TemplateTask20steps2 timeout. + + + TemplateTask20steps3 timeout. + + + TemplateTask20steps4 timeout. + + + TemplateTask20steps5 timeout. + + + TemplateTask20steps6 timeout. + + \ No newline at end of file diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc4_v_5_x_x.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4_v_5_x_x.st index f7d847621..27f56a1ab 100644 --- a/src/components.kuka.robotics/ctrl/src/AxoKrc4_v_5_x_x.st +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc4_v_5_x_x.st @@ -452,7 +452,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x THIS.CallTimers(TRUE); StartAtMainTask.ThrowWhen(_errorTimer.output ); Status.Action.Id := TO_UINT(_progress); - StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartAtMainTask timeout.'); + StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartAtMainTask timeout.#>'); END_IF; IF StartAtMainTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -601,7 +601,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x THIS.CallTimers(TRUE); StartMotorsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsAndProgramTask timeout.'); + StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsAndProgramTask timeout.#>'); END_IF; IF StartMotorsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -847,7 +847,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x THIS.CallTimers(TRUE); StartMotorsProgramAndMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartMotorsProgramAndMovementsTask.ThrowWhen(StartMotorsProgramAndMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsProgramAndMovementsTask timeout.'); + StartMotorsProgramAndMovementsTask.ThrowWhen(StartMotorsProgramAndMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsProgramAndMovementsTask timeout.#>'); END_IF; IF StartMotorsProgramAndMovementsTask.IsFirstExecutionCycle() THEN MovementParameters := Status.CurrentMovementParameters; @@ -1120,7 +1120,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x StartMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMovementsTask timeout.'); + StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMovementsTask timeout.#>'); END_IF; IF StartMovementsTask.IsFirstExecutionCycle() THEN MovementParameters := Status.CurrentMovementParameters; @@ -1271,7 +1271,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x THIS.CallTimers(TRUE); StartProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StartProgramTask.ThrowWhen(StartProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartProgramTask timeout.'); + StartProgramTask.ThrowWhen(StartProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartProgramTask timeout.#>'); END_IF; IF StartProgramTask.DoneReached() THEN Status.Action.Id := UINT#171; @@ -1334,7 +1334,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x THIS.CallTimers(TRUE); StopMotorsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StopMotorsTask.ThrowWhen(StopMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMotorsTask timeout.'); + StopMotorsTask.ThrowWhen(StopMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMotorsTask timeout.#>'); END_IF; IF StopMotorsTask.DoneReached() THEN Status.Action.Id := UINT#181; @@ -1405,7 +1405,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x StopMovementsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsAndProgramTask timeout.'); + StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsAndProgramTask timeout.#>'); END_IF; IF StopMovementsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#191; @@ -1465,7 +1465,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x StopMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsTask timeout.'); + StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsTask timeout.#>'); END_IF; IF StopMovementsTask.DoneReached() THEN Status.Action.Id := UINT#201; @@ -1524,7 +1524,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x StopProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - StopProgramTask.ThrowWhen(StopProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopProgramTask timeout.'); + StopProgramTask.ThrowWhen(StopProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopProgramTask timeout.#>'); END_IF; IF StopProgramTask.DoneReached() THEN Status.Action.Id := UINT#911; diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.Designer.cs b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.Designer.cs index 2f7937ae0..092bc967b 100644 --- a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.Designer.cs +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,86 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to StartAtMainTask timeout.. + /// + public static string StartAtMainTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartAtMainTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMotorsAndProgramTask timeout.. + /// + public static string StartMotorsAndProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMotorsAndProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMotorsProgramAndMovementsTask timeout.. + /// + public static string StartMotorsProgramAndMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMotorsProgramAndMovementsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMovementsTask timeout.. + /// + public static string StartMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMovementsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartProgramTask timeout.. + /// + public static string StartProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMotorsTask timeout.. + /// + public static string StopMotorsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMotorsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMovementsAndProgramTask timeout.. + /// + public static string StopMovementsAndProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMovementsAndProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMovementsTask timeout.. + /// + public static string StopMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMovementsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopProgramTask timeout.. + /// + public static string StopProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopProgramTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.de.resx b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..461dc4869 --- /dev/null +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.de.resx @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + StartAtMainTask-Zeitüberschreitung. + + + StartMotorsAndProgramTask Zeitüberschreitung. + + + StartMotorsProgramAndMovementsTask Zeitüberschreitung. + + + StartMovementsTask Zeitüberschreitung. + + + StartProgrammAufgabe Zeitüberschreitung. + + + StopMotorsTask Zeitüberschreitung. + + + StopMovementsAndProgramTask timeout. + + + StopMovementsTask Zeitüberschreitung. + + + StopProgramTask Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.es.resx b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..f54aed612 --- /dev/null +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.es.resx @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de StartAtMainTask. + + + Tiempo de espera de StartMotorsAndProgramTask. + + + Tiempo de espera de StartMotorsProgramAndMovementsTask. + + + Tiempo de espera de StartMovementsTask. + + + Tiempo de espera de StartProgramTask. + + + Tiempo de espera de StopMotorsTask. + + + Tiempo de espera de StopMovementsAndProgramTask. + + + Tiempo de espera de StopMovementsTask. + + + Tiempo de espera de StopProgramTask. + + \ No newline at end of file diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.resx b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.resx index e8ae276d9..92ec49fed 100644 --- a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.resx +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.resx @@ -58,4 +58,40 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StartAtMainTask timeout. + src\AxoKrc4_v_5_x_x.st,454 + + + StartMotorsAndProgramTask timeout. + src\AxoKrc4_v_5_x_x.st,603 + + + StartMotorsProgramAndMovementsTask timeout. + src\AxoKrc4_v_5_x_x.st,849 + + + StartMovementsTask timeout. + src\AxoKrc4_v_5_x_x.st,1122 + + + StartProgramTask timeout. + src\AxoKrc4_v_5_x_x.st,1273 + + + StopMotorsTask timeout. + src\AxoKrc4_v_5_x_x.st,1336 + + + StopMovementsAndProgramTask timeout. + src\AxoKrc4_v_5_x_x.st,1407 + + + StopMovementsTask timeout. + src\AxoKrc4_v_5_x_x.st,1467 + + + StopProgramTask timeout. + src\AxoKrc4_v_5_x_x.st,1526 + \ No newline at end of file diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.sk.resx b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..8c21ca500 --- /dev/null +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/Resources/PlcStringResources.sk.resx @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit StartAtMainTask. + + + Časový limit StartMotorsAndProgramTask. + + + StartMotorsProgramAndMovementsTask timeout. + + + Časový limit StartMovementsTask. + + + Časový limit StartProgramTask. + + + StopMotorsTask timeout. + + + StopMovementsAndProgramTask timeout. + + + StopMovementsTask timeout. + + + StopProgramTask timeout. + + \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/ctrl/src/AxoCr800_v_1_x_x.st b/src/components.mitsubishi.robotics/ctrl/src/AxoCr800_v_1_x_x.st index 79746fa6e..1ecbac003 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/AxoCr800_v_1_x_x.st +++ b/src/components.mitsubishi.robotics/ctrl/src/AxoCr800_v_1_x_x.st @@ -438,7 +438,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x THIS.CallTimers(TRUE); StartAtMainTask.ThrowWhen(_errorTimer.output ); Status.Action.Id := TO_UINT(_power_progress); - StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartAtMainTask timeout.'); + StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartAtMainTask timeout.#>'); END_IF; IF StartAtMainTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -622,7 +622,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x THIS.CallTimers(TRUE); StartMotorsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsAndProgramTask timeout.'); + StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsAndProgramTask timeout.#>'); END_IF; IF StartMotorsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -710,7 +710,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x THIS.CallTimers(TRUE); StopMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsTask timeout.'); + StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsTask timeout.#>'); END_IF; IF StopMovementsTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -800,7 +800,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x THIS.CallTimers(TRUE); StopMovementsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsAndProgramTask timeout.'); + StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsAndProgramTask timeout.#>'); END_IF; IF StopMovementsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#131; @@ -978,7 +978,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x THIS.CallTimers(TRUE); StartMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_movement_progress); - StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMovementsTask timeout.'); + StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMovementsTask timeout.#>'); END_IF; IF StartMovementsTask.IsFirstExecutionCycle() THEN MovementParameters := Status.CurrentMovementParameters; diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/AxoCr800/AxoCr800View.razor b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/AxoCr800/AxoCr800View.razor index c57708b4e..739e4d7d7 100644 --- a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/AxoCr800/AxoCr800View.razor +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/AxoCr800/AxoCr800View.razor @@ -8,33 +8,33 @@
@if (Component.Inputs.ServoOn.Cyclic) { - Servo On + @Localizer["ServoOn"] } else { - Servo Off + @Localizer["ServoOff"] } @if (Component.Inputs.Start.Cyclic) { - Running + @Localizer["Running"] } else if (Component.Inputs.Stop.Cyclic) { - Stopped + @Localizer["Stopped"] } @if (Component.Inputs.HighLevelError.Cyclic || Component.Inputs.LowLevelError.Cyclic) { - Error + @Localizer["Error"] } else if (Component.Inputs.CautionLevelError.Cyclic) { - Warning + @Localizer["Warning"] } else if (Component.Inputs.EmergencyError.Cyclic) { - Emergency + @Localizer["Emergency"] }
@@ -43,26 +43,26 @@
- - + +
- - + +
- - + +
-

Movement Parameters

+

@Localizer["MovementParameters"]

@@ -73,7 +73,7 @@
-

Coordinates

+

@Localizer["Coordinates"]

@@ -90,20 +90,20 @@
- - + +
- - + +
- - + +
@@ -112,70 +112,70 @@
- +
-

Robot Status

+

@Localizer["RobotStatus"]

- Operation Enable + @Localizer["OperationEnable"]
- Auto Enable + @Localizer["AutoEnable"]
- Servo On + @Localizer["ServoOn"]
- Start + @Localizer["Start"]
- Stop + @Localizer["Stop"]
- RC Ready + @Localizer["RcReady"]
- +
-

Error Status

+

@Localizer["ErrorStatus"]

- High Level Error + @Localizer["HighLevelError"]
- Low Level Error + @Localizer["LowLevelError"]
- Caution Level + @Localizer["CautionLevel"]
- Emergency Error + @Localizer["EmergencyError"]
- Battery Low + @Localizer["BatteryLow"]
- +
-

Position && Zone Status

+

@Localizer["PositionAndZoneStatus"]

@@ -183,19 +183,19 @@
- In Area 1 + @Localizer["InArea1"]
- In Area 2 + @Localizer["InArea2"]
- In Position 1 + @Localizer["InPosition1"]
- In Position 2 + @Localizer["InPosition2"]
@@ -203,9 +203,9 @@ - +
-

Current Coordinates

+

@Localizer["CurrentCoordinates"]

@@ -218,41 +218,41 @@ - +
-

Tool Status

+

@Localizer["ToolStatus"]

- Tool 1 @(Component.Inputs.Tool_1_Extend.Cyclic ? "Extended" : Component.Inputs.Tool_1_Retract.Cyclic ? "Retracted" : "Unknown") + @Localizer["Tool1"] @(Component.Inputs.Tool_1_Extend.Cyclic ? Localizer["Extended"] : Component.Inputs.Tool_1_Retract.Cyclic ? Localizer["Retracted"] : Localizer["Unknown"])
- Tool 2 @(Component.Inputs.Tool_2_Extend.Cyclic ? "Extended" : Component.Inputs.Tool_2_Retract.Cyclic ? "Retracted" : "Unknown") + @Localizer["Tool2"] @(Component.Inputs.Tool_2_Extend.Cyclic ? Localizer["Extended"] : Component.Inputs.Tool_2_Retract.Cyclic ? Localizer["Retracted"] : Localizer["Unknown"])
- Tool 3 @(Component.Inputs.Tool_3_Extend.Cyclic ? "Extended" : Component.Inputs.Tool_3_Retract.Cyclic ? "Retracted" : "Unknown") + @Localizer["Tool3"] @(Component.Inputs.Tool_3_Extend.Cyclic ? Localizer["Extended"] : Component.Inputs.Tool_3_Retract.Cyclic ? Localizer["Retracted"] : Localizer["Unknown"])
- Tool 4 @(Component.Inputs.Tool_4_Extend.Cyclic ? "Extended" : Component.Inputs.Tool_4_Retract.Cyclic ? "Retracted" : "Unknown") + @Localizer["Tool4"] @(Component.Inputs.Tool_4_Extend.Cyclic ? Localizer["Extended"] : Component.Inputs.Tool_4_Retract.Cyclic ? Localizer["Retracted"] : Localizer["Unknown"])
- +
-

Configuration

+

@Localizer["Configuration"]

 - +
-

Hardware Diagnostics

+

@Localizer["HardwareDiagnostics"]

 diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.cs b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.cs new file mode 100644 index 000000000..8f0de5047 --- /dev/null +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.cs @@ -0,0 +1,9 @@ +namespace AXOpen.Components.Mitsubishi.Robotics.Resources +{ + /// + /// Marker class for localization resources. + /// + public class Strings + { + } +} diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.de.resx b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.de.resx new file mode 100644 index 000000000..59888c5b4 --- /dev/null +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.de.resx @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Servo ein + + + Servo aus + + + Laufen + + + Angehalten + + + Fehler + + + Warnung + + + Notfall + + + Beginnen Sie bei Main + + + Wiederherstellen + + + Startmotoren & Programm + + + Bewegungen & Programm stoppen + + + Bewegungen starten + + + Bewegungen stoppen + + + Bewegungsparameter + + + Koordinaten + + + Roboterstatus + + + Operation Aktivieren + + + Automatisch aktivieren + + + Start + + + Halt + + + RC-fähig + + + Fehlerstatus + + + Fehler auf hoher Ebene + + + Fehler niedriger Stufe + + + Vorsichtsstufe + + + Notfallfehler + + + Batterie schwach + + + Position & Zonenstatus + + + In Bereich 1 + + + In Bereich 2 + + + In Position 1 + + + In Position 2 + + + Aktuelle Koordinaten + + + Werkzeugstatus + + + Werkzeug 1 + + + Werkzeug 2 + + + Werkzeug 3 + + + Werkzeug 4 + + + Erweitert + + + Zurückgezogen + + + Unbekannt + + + Konfiguration + + + Hardware-Diagnose + + \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.es.resx b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.es.resx new file mode 100644 index 000000000..ef045b2e9 --- /dev/null +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.es.resx @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Servo activado + + + Servo desactivado + + + Correr + + + Detenido + + + Error + + + Advertencia + + + Emergencia + + + Comience en Main + + + Restaurar + + + Arranque motores y programa + + + Detener movimientos y programa + + + Iniciar movimientos + + + Detener movimientos + + + Parámetros de movimiento + + + Coordenadas + + + Estado del robot + + + Operación Habilitar + + + Habilitar automáticamente + + + Inicio + + + Detener + + + Listo para RC + + + Estado del error + + + Error de alto nivel + + + Error de bajo nivel + + + Nivel de precaución + + + Error de emergencia + + + Batería baja + + + Posición y estado de la zona + + + En el Área 1 + + + En el Área 2 + + + En la posición 1 + + + En la posición 2 + + + Coordenadas actuales + + + Estado de la herramienta + + + Herramienta 1 + + + Herramienta 2 + + + Herramienta 3 + + + Herramienta 4 + + + Ampliado + + + Retractado + + + Desconocido + + + Configuración + + + Diagnóstico de hardware + + \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.resx b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.resx new file mode 100644 index 000000000..072d0ecc2 --- /dev/null +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.resx @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Servo On + + + Servo Off + + + Running + + + Stopped + + + Error + + + Warning + + + Emergency + + + + Start at Main + + + Restore + + + Start Motors & Program + + + Stop Movements & Program + + + Start Movements + + + Stop Movements + + + Movement Parameters + + + Coordinates + + + + Robot Status + + + Operation Enable + + + Auto Enable + + + Start + + + Stop + + + RC Ready + + + + Error Status + + + High Level Error + + + Low Level Error + + + Caution Level + + + Emergency Error + + + Battery Low + + + + Position & Zone Status + + + In Area 1 + + + In Area 2 + + + In Position 1 + + + In Position 2 + + + + Current Coordinates + + + + Tool Status + + + Tool 1 + + + Tool 2 + + + Tool 3 + + + Tool 4 + + + Extended + + + Retracted + + + Unknown + + + + Configuration + + + + Hardware Diagnostics + + diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.sk.resx b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.sk.resx new file mode 100644 index 000000000..a7359dc93 --- /dev/null +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/Resources/Strings.sk.resx @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Servo zapnuté + + + Servo vypnuté + + + Beh + + + Zastavené + + + Chyba + + + Upozornenie + + + Núdzový stav + + + Začnite na hlavnej stránke + + + Obnoviť + + + Štartovacie motory a program + + + Zastavte pohyby a program + + + Začať pohyby + + + Zastavte pohyby + + + Parametre pohybu + + + Súradnice + + + Stav robota + + + Operácia Povoliť + + + Automatické zapnutie + + + Začať + + + Zastaviť + + + RC pripravené + + + Stav chyby + + + Chyba vysokej úrovne + + + Chyba nízkej úrovne + + + Úroveň opatrnosti + + + Núdzová chyba + + + Nízky stav batérie + + + Poloha a stav zóny + + + V oblasti 1 + + + V oblasti 2 + + + V pozícii 1 + + + V pozícii 2 + + + Aktuálne súradnice + + + Stav nástroja + + + Nástroj 1 + + + Nástroj 2 + + + Nástroj 3 + + + Nástroj 4 + + + Rozšírené + + + Stiahnuté + + + Neznámy + + + Konfigurácia + + + Diagnostika hardvéru + + \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/_Imports.razor b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/_Imports.razor index 814463efb..bdbf6b39f 100644 --- a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/_Imports.razor +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics.blazor/_Imports.razor @@ -1,6 +1,10 @@ @using Microsoft.AspNetCore.Components.Web +@using Microsoft.Extensions.Localization @using AXSharp.Presentation.Blazor.Controls.RenderableContent @using Microsoft.AspNetCore.Components.Authorization @using AXOpen.Core @using AXOpen.Core.Blazor -@using AXOpen.Messaging.Static \ No newline at end of file +@using AXOpen.Messaging.Static +@using AXOpen.Components.Mitsubishi.Robotics.Resources + +@inject IStringLocalizer Localizer \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.Designer.cs b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.Designer.cs index 21021d429..dc97718c9 100644 --- a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.Designer.cs +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,50 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to StartAtMainTask timeout.. + /// + public static string StartAtMainTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartAtMainTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMotorsAndProgramTask timeout.. + /// + public static string StartMotorsAndProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMotorsAndProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMovementsTask timeout.. + /// + public static string StartMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMovementsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMovementsAndProgramTask timeout.. + /// + public static string StopMovementsAndProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMovementsAndProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMovementsTask timeout.. + /// + public static string StopMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMovementsTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.de.resx b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..bb9ae24ba --- /dev/null +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.de.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + StartAtMainTask-Zeitüberschreitung. + + + StartMotorsAndProgramTask Zeitüberschreitung. + + + StopMovementsTask Zeitüberschreitung. + + + StopMovementsAndProgramTask timeout. + + + StartMovementsTask Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.es.resx b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..f5640ede6 --- /dev/null +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.es.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de StartAtMainTask. + + + Tiempo de espera de StartMotorsAndProgramTask. + + + Tiempo de espera de StopMovementsTask. + + + Tiempo de espera de StopMovementsAndProgramTask. + + + Tiempo de espera de StartMovementsTask. + + \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.resx b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.resx index e8ae276d9..2f32a2bdc 100644 --- a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.resx +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.resx @@ -58,4 +58,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StartAtMainTask timeout. + src\AxoCr800_v_1_x_x.st,440 + + + StartMotorsAndProgramTask timeout. + src\AxoCr800_v_1_x_x.st,624 + + + StopMovementsTask timeout. + src\AxoCr800_v_1_x_x.st,712 + + + StopMovementsAndProgramTask timeout. + src\AxoCr800_v_1_x_x.st,802 + + + StartMovementsTask timeout. + src\AxoCr800_v_1_x_x.st,980 + \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.sk.resx b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..d72d6053e --- /dev/null +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/Resources/PlcStringResources.sk.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit StartAtMainTask. + + + Časový limit StartMotorsAndProgramTask. + + + StopMovementsTask timeout. + + + StopMovementsAndProgramTask timeout. + + + Časový limit StartMovementsTask. + + \ No newline at end of file diff --git a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/AxoCylinder/AxoCylinderView.razor b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/AxoCylinder/AxoCylinderView.razor index b210d43a5..3059655a6 100644 --- a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/AxoCylinder/AxoCylinderView.razor +++ b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/AxoCylinder/AxoCylinderView.razor @@ -15,7 +15,7 @@ } else if (IsMoving) { - Moving + @Localizer["Moving"] } else { @@ -27,7 +27,7 @@
- +
@@ -37,7 +37,7 @@
- +
diff --git a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.cs b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.cs new file mode 100644 index 000000000..aaa603a40 --- /dev/null +++ b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.cs @@ -0,0 +1,9 @@ +namespace AXOpen.Components.Pneumatics.Resources +{ + /// + /// Marker class for localization resources. + /// + public class Strings + { + } +} diff --git a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.de.resx b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.de.resx new file mode 100644 index 000000000..d9964ae66 --- /dev/null +++ b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.de.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Umzug + + + STOPP + + \ No newline at end of file diff --git a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.es.resx b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.es.resx new file mode 100644 index 000000000..2433994d6 --- /dev/null +++ b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.es.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Mudanza + + + ALTO + + \ No newline at end of file diff --git a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.resx b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.resx new file mode 100644 index 000000000..6de26ca19 --- /dev/null +++ b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.resx @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Moving + + + STOP + + diff --git a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.sk.resx b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.sk.resx new file mode 100644 index 000000000..20d38f20a --- /dev/null +++ b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/Resources/Strings.sk.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Sťahovanie + + + STOP + + \ No newline at end of file diff --git a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/_Imports.razor b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/_Imports.razor index 4eb1a394d..eb5dba2e1 100644 --- a/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/_Imports.razor +++ b/src/components.pneumatics/src/AXOpen.Components.Pneumatics.blazor/_Imports.razor @@ -1,5 +1,9 @@ @using Microsoft.AspNetCore.Components.Web +@using Microsoft.Extensions.Localization @using AXSharp.Presentation.Blazor.Controls.RenderableContent @using Microsoft.AspNetCore.Components.Authorization @using AXOpen.Core -@using AXOpen.Messaging.Static \ No newline at end of file +@using AXOpen.Messaging.Static +@using AXOpen.Components.Pneumatics.Resources + +@inject IStringLocalizer Localizer \ No newline at end of file diff --git a/src/components.rexroth.drives/ctrl/src/AxoCtrlxDriveXsc/AxoCtrlxDriveXsc.st b/src/components.rexroth.drives/ctrl/src/AxoCtrlxDriveXsc/AxoCtrlxDriveXsc.st index d1b43f736..f5b10a620 100644 --- a/src/components.rexroth.drives/ctrl/src/AxoCtrlxDriveXsc/AxoCtrlxDriveXsc.st +++ b/src/components.rexroth.drives/ctrl/src/AxoCtrlxDriveXsc/AxoCtrlxDriveXsc.st @@ -2221,7 +2221,7 @@ NAMESPACE AXOpen.Components.Rexroth.Drives THIS.CallTimers(TRUE,FALSE); THIS.AxoHome_Task.ThrowWhen(_errorTimer.output ); - THIS.AxoHome_Task.ThrowWhen(THIS.AxoHome_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'AxoHome_Task timeout.'); + THIS.AxoHome_Task.ThrowWhen(THIS.AxoHome_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'<#AxoHome_Task timeout.#>'); DriveStatus.Action.Id := _State; END_IF; @@ -2394,7 +2394,7 @@ NAMESPACE AXOpen.Components.Rexroth.Drives END_IF; THIS.CallTimers(TRUE,FALSE); THIS.AxoStop_Task.ThrowWhen(_errorTimer.output ); - THIS.AxoStop_Task.ThrowWhen(THIS.AxoStop_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'AxoStop_Task timeout.'); + THIS.AxoStop_Task.ThrowWhen(THIS.AxoStop_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'<#AxoStop_Task timeout.#>'); DriveStatus.Action.Id := _State; END_IF; @@ -2559,7 +2559,7 @@ NAMESPACE AXOpen.Components.Rexroth.Drives END_IF; THIS.CallTimers(TRUE,FALSE); THIS.AxoHalt_Task.ThrowWhen(_errorTimer.output ); - THIS.AxoHalt_Task.ThrowWhen(THIS.AxoHalt_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'AxoHalt_Task timeout.'); + THIS.AxoHalt_Task.ThrowWhen(THIS.AxoHalt_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'<#AxoHalt_Task timeout.#>'); DriveStatus.Action.Id := _State; END_IF; @@ -2792,7 +2792,7 @@ NAMESPACE AXOpen.Components.Rexroth.Drives THIS.CallTimers(TRUE,FALSE); THIS.AxoMoveAbsolute_Task.ThrowWhen(_errorTimer.output ); - THIS.AxoMoveAbsolute_Task.ThrowWhen(THIS.AxoMoveAbsolute_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'AxoMoveAbsolute_Task timeout.'); + THIS.AxoMoveAbsolute_Task.ThrowWhen(THIS.AxoMoveAbsolute_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'<#AxoMoveAbsolute_Task timeout.#>'); DriveStatus.Action.Id := _State; END_IF; @@ -3033,7 +3033,7 @@ NAMESPACE AXOpen.Components.Rexroth.Drives THIS.CallTimers(TRUE,FALSE); THIS.AxoMoveRelative_Task.ThrowWhen(_errorTimer.output ); - THIS.AxoMoveRelative_Task.ThrowWhen(THIS.AxoMoveRelative_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'AxoMoveRelative_Task timeout.'); + THIS.AxoMoveRelative_Task.ThrowWhen(THIS.AxoMoveRelative_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'<#AxoMoveRelative_Task timeout.#>'); DriveStatus.Action.Id := _State; END_IF; @@ -3284,7 +3284,7 @@ NAMESPACE AXOpen.Components.Rexroth.Drives END_IF; THIS.CallTimers(TRUE,FALSE); THIS.AxoMoveAdditive_Task.ThrowWhen(_errorTimer.output ); - THIS.AxoMoveAdditive_Task.ThrowWhen(THIS.AxoMoveAdditive_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'AxoMoveAdditive_Task timeout.'); + THIS.AxoMoveAdditive_Task.ThrowWhen(THIS.AxoMoveAdditive_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'<#AxoMoveAdditive_Task timeout.#>'); DriveStatus.Action.Id := _State; END_IF; @@ -3558,7 +3558,7 @@ NAMESPACE AXOpen.Components.Rexroth.Drives END_IF; THIS.CallTimers(TRUE,FALSE); THIS.AxoMoveVelocity_Task.ThrowWhen(_errorTimer.output ); - THIS.AxoMoveVelocity_Task.ThrowWhen(THIS.AxoMoveVelocity_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'AxoMoveVelocity_Task timeout.'); + THIS.AxoMoveVelocity_Task.ThrowWhen(THIS.AxoMoveVelocity_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'<#AxoMoveVelocity_Task timeout.#>'); DriveStatus.Action.Id := _State; ELSE InVelocity := FALSE; @@ -4137,7 +4137,7 @@ NAMESPACE AXOpen.Components.Rexroth.Drives END_IF; THIS.CallTimers(TRUE,FALSE); THIS.AxoSetPosition_Task.ThrowWhen(_errorTimer.output ); - THIS.AxoSetPosition_Task.ThrowWhen(THIS.AxoHome_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'AxoSetPosition_Task timeout.'); + THIS.AxoSetPosition_Task.ThrowWhen(THIS.AxoHome_Task.Duration >= DriveConfig.TaskTimeout AND DriveConfig.TaskTimeout > T#0s ,'<#AxoSetPosition_Task timeout.#>'); DriveStatus.Action.Id := _State; END_IF; diff --git a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.Designer.cs b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.Designer.cs index 87917568a..db5726f03 100644 --- a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.Designer.cs +++ b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,77 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to AxoHalt_Task timeout.. + /// + public static string AxoHalt_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("AxoHalt_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AxoHome_Task timeout.. + /// + public static string AxoHome_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("AxoHome_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AxoMoveAbsolute_Task timeout.. + /// + public static string AxoMoveAbsolute_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("AxoMoveAbsolute_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AxoMoveAdditive_Task timeout.. + /// + public static string AxoMoveAdditive_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("AxoMoveAdditive_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AxoMoveRelative_Task timeout.. + /// + public static string AxoMoveRelative_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("AxoMoveRelative_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AxoMoveVelocity_Task timeout.. + /// + public static string AxoMoveVelocity_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("AxoMoveVelocity_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AxoSetPosition_Task timeout.. + /// + public static string AxoSetPosition_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("AxoSetPosition_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AxoStop_Task timeout.. + /// + public static string AxoStop_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("AxoStop_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.de.resx b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..1ebac0883 --- /dev/null +++ b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.de.resx @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AxoHomeTask Zeitüberschreitung. + + + AxoStopTask Zeitüberschreitung. + + + AxoHaltTask Zeitüberschreitung. + + + AxoMoveAbsoluteTask Zeitüberschreitung. + + + AxoMoveRelativeTask Zeitüberschreitung. + + + AxoMoveAdditiveTask Zeitüberschreitung. + + + AxoMoveVelocityTask Zeitüberschreitung. + + + AxoSetPositionTask Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.es.resx b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..4c8b7cdb5 --- /dev/null +++ b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.es.resx @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de AxoHomeTask. + + + Tiempo de espera de AxoStopTask. + + + Tiempo de espera de AxoHaltTask. + + + Tiempo de espera de AxoMoveAbsoluteTask. + + + Tiempo de espera de AxoMoveRelativeTask. + + + Tiempo de espera de AxoMoveAdditiveTask. + + + Tiempo de espera de AxoMoveVelocityTask. + + + Tiempo de espera de AxoSetPositionTask. + + \ No newline at end of file diff --git a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.resx b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.resx index e8ae276d9..c14e0db87 100644 --- a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.resx +++ b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.resx @@ -58,4 +58,36 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + AxoHome_Task timeout. + src\AxoCtrlxDriveXsc\AxoCtrlxDriveXsc.st,2223 + + + AxoStop_Task timeout. + src\AxoCtrlxDriveXsc\AxoCtrlxDriveXsc.st,2396 + + + AxoHalt_Task timeout. + src\AxoCtrlxDriveXsc\AxoCtrlxDriveXsc.st,2561 + + + AxoMoveAbsolute_Task timeout. + src\AxoCtrlxDriveXsc\AxoCtrlxDriveXsc.st,2794 + + + AxoMoveRelative_Task timeout. + src\AxoCtrlxDriveXsc\AxoCtrlxDriveXsc.st,3035 + + + AxoMoveAdditive_Task timeout. + src\AxoCtrlxDriveXsc\AxoCtrlxDriveXsc.st,3286 + + + AxoMoveVelocity_Task timeout. + src\AxoCtrlxDriveXsc\AxoCtrlxDriveXsc.st,3560 + + + AxoSetPosition_Task timeout. + src\AxoCtrlxDriveXsc\AxoCtrlxDriveXsc.st,4139 + \ No newline at end of file diff --git a/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.sk.resx b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..cfd6d115e --- /dev/null +++ b/src/components.rexroth.drives/src/AXOpen.Components.Rexroth.Drives/Resources/PlcStringResources.sk.resx @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit AxoHomeTask. + + + Časový limit AxoStopTask. + + + Časový limit AxoHaltTask. + + + AxoMoveAbsoluteTask timeout. + + + AxoMoveRelativeTask timeout. + + + AxoMoveAdditiveTask timeout. + + + AxoMoveVelocityTask timeout. + + + Časový limit úlohy AxoSetPositionTask. + + \ No newline at end of file diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit_v_4_x_x.st index cfac0c93d..2c88e71c0 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit_v_4_x_x.st @@ -581,7 +581,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press THIS.CallTimers(TRUE); RunCommandTask.ThrowWhen(_errorTimer.output ); Status.Action.Id := TO_UINT(_progress); - RunCommandTask.ThrowWhen(RunCommandTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'RunCommandTask timeout.'); + RunCommandTask.ThrowWhen(RunCommandTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#RunCommandTask timeout.#>'); END_IF; IF RunCommandTask.DoneReached() THEN Status.Action.Id := UINT#101; diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.Designer.cs b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.Designer.cs index 81e4f5a65..9dd276ace 100644 --- a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.Designer.cs +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,14 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to RunCommandTask timeout.. + /// + public static string RunCommandTask_timeout_DOT_ { + get { + return ResourceManager.GetString("RunCommandTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.de.resx b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..405e99e68 --- /dev/null +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.de.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + RunCommandTask-Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.es.resx b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..c700266ef --- /dev/null +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.es.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de RunCommandTask. + + \ No newline at end of file diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.resx b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.resx index e8ae276d9..16b70cf9e 100644 --- a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.resx +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.resx @@ -58,4 +58,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + RunCommandTask timeout. + src\AxoSmartFunctionKit_v_4_x_x.st,583 + \ No newline at end of file diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.sk.resx b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..67c45f68c --- /dev/null +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/Resources/PlcStringResources.sk.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit RunCommandTask. + + \ No newline at end of file diff --git a/src/components.rexroth.tightening/ctrl/src/Axo_CS351_compact/Axo_CS351_compact.st b/src/components.rexroth.tightening/ctrl/src/Axo_CS351_compact/Axo_CS351_compact.st index dca62ac1c..58760dfd7 100644 --- a/src/components.rexroth.tightening/ctrl/src/Axo_CS351_compact/Axo_CS351_compact.st +++ b/src/components.rexroth.tightening/ctrl/src/Axo_CS351_compact/Axo_CS351_compact.st @@ -1766,7 +1766,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening DisableTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - DisableTask.ThrowWhen(DisableTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'DisableTask timeout.'); + DisableTask.ThrowWhen(DisableTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#DisableTask timeout.#>'); END_IF; IF DisableTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -1825,7 +1825,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening EnableTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - EnableTask.ThrowWhen(EnableTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'EnableTask timeout.'); + EnableTask.ThrowWhen(EnableTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#EnableTask timeout.#>'); END_IF; IF EnableTask.DoneReached() THEN Status.Action.Id := UINT#106; @@ -1885,7 +1885,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening DisableClockwiseTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - DisableClockwiseTask.ThrowWhen(DisableClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'DisableClockwiseTask timeout.'); + DisableClockwiseTask.ThrowWhen(DisableClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#DisableClockwiseTask timeout.#>'); END_IF; IF DisableClockwiseTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -1945,7 +1945,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening EnableClockwiseTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - EnableClockwiseTask.ThrowWhen(EnableClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'EnableClockwiseTask timeout.'); + EnableClockwiseTask.ThrowWhen(EnableClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#EnableClockwiseTask timeout.#>'); END_IF; IF EnableClockwiseTask.DoneReached() THEN Status.Action.Id := UINT#116; @@ -2005,7 +2005,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening DisableCounterClockwiseTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - DisableCounterClockwiseTask.ThrowWhen(DisableCounterClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'DisableCounterClockwiseTask timeout.'); + DisableCounterClockwiseTask.ThrowWhen(DisableCounterClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#DisableCounterClockwiseTask timeout.#>'); END_IF; IF DisableCounterClockwiseTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -2065,7 +2065,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening EnableCounterClockwiseTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - EnableCounterClockwiseTask.ThrowWhen(EnableCounterClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'EnableCounterClockwiseTask timeout.'); + EnableCounterClockwiseTask.ThrowWhen(EnableCounterClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#EnableCounterClockwiseTask timeout.#>'); END_IF; IF EnableCounterClockwiseTask.DoneReached() THEN Status.Action.Id := UINT#126; @@ -2160,7 +2160,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening ResetFaultTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ResetFaultTask.ThrowWhen(ResetFaultTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ResetFaultTask timeout.'); + ResetFaultTask.ThrowWhen(ResetFaultTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ResetFaultTask timeout.#>'); END_IF; IF ResetFaultTask.DoneReached() THEN Status.Action.Id := UINT#131; @@ -2219,7 +2219,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening ResetResultsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ResetResultsTask.ThrowWhen(ResetResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ResetResultsTask timeout.'); + ResetResultsTask.ThrowWhen(ResetResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ResetResultsTask timeout.#>'); END_IF; IF ResetResultsTask.DoneReached() THEN Status.Action.Id := UINT#136; @@ -2319,7 +2319,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening SetScrewingProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - SetScrewingProgramTask.ThrowWhen(SetScrewingProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'SetScrewingProgramTask timeout.'); + SetScrewingProgramTask.ThrowWhen(SetScrewingProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#SetScrewingProgramTask timeout.#>'); END_IF; IF SetScrewingProgramTask.DoneReached() THEN Status.Action.Id := UINT#141; @@ -2391,7 +2391,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening GetScrewingResultsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - GetScrewingResultsTask.ThrowWhen(GetScrewingResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'GetScrewingResultsTask timeout.'); + GetScrewingResultsTask.ThrowWhen(GetScrewingResultsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#GetScrewingResultsTask timeout.#>'); END_IF; IF GetScrewingResultsTask.DoneReached() THEN Status.Action.Id := UINT#151; @@ -2609,7 +2609,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening ScrewClockwiseTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ScrewClockwiseTask.ThrowWhen(ScrewClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ScrewClockwiseTask timeout.'); + ScrewClockwiseTask.ThrowWhen(ScrewClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ScrewClockwiseTask timeout.#>'); END_IF; IF ScrewClockwiseTask.DoneReached() THEN Status.Action.Id := UINT#161; @@ -2822,7 +2822,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening ScrewCounterClockwiseTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ScrewCounterClockwiseTask.ThrowWhen(ScrewCounterClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ScrewCounterClockwiseTask timeout.'); + ScrewCounterClockwiseTask.ThrowWhen(ScrewCounterClockwiseTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ScrewCounterClockwiseTask timeout.#>'); END_IF; IF ScrewCounterClockwiseTask.DoneReached() THEN Status.Action.Id := UINT#181; @@ -3194,7 +3194,7 @@ NAMESPACE AXOpen.Components.Rexroth.Tightening RunAutomatTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - RunAutomatTask.ThrowWhen(RunAutomatTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'RunAutomatTask timeout.'); + RunAutomatTask.ThrowWhen(RunAutomatTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#RunAutomatTask timeout.#>'); END_IF; IF RunAutomatTask.DoneReached() THEN Status.Action.Id := UINT#201; diff --git a/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.Designer.cs b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.Designer.cs index d7cefa276..350044576 100644 --- a/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.Designer.cs +++ b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.Designer.cs @@ -19,7 +19,7 @@ namespace AXOpen.Components.Rexroth.Tightening.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class PlcStringResources { @@ -59,5 +59,122 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to DisableClockwiseTask timeout.. + /// + public static string DisableClockwiseTask_timeout_DOT_ { + get { + return ResourceManager.GetString("DisableClockwiseTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DisableCounterClockwiseTask timeout.. + /// + public static string DisableCounterClockwiseTask_timeout_DOT_ { + get { + return ResourceManager.GetString("DisableCounterClockwiseTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DisableTask timeout.. + /// + public static string DisableTask_timeout_DOT_ { + get { + return ResourceManager.GetString("DisableTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to EnableClockwiseTask timeout.. + /// + public static string EnableClockwiseTask_timeout_DOT_ { + get { + return ResourceManager.GetString("EnableClockwiseTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to EnableCounterClockwiseTask timeout.. + /// + public static string EnableCounterClockwiseTask_timeout_DOT_ { + get { + return ResourceManager.GetString("EnableCounterClockwiseTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to EnableTask timeout.. + /// + public static string EnableTask_timeout_DOT_ { + get { + return ResourceManager.GetString("EnableTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GetScrewingResultsTask timeout.. + /// + public static string GetScrewingResultsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("GetScrewingResultsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ResetFaultTask timeout.. + /// + public static string ResetFaultTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ResetFaultTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ResetResultsTask timeout.. + /// + public static string ResetResultsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ResetResultsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RunAutomatTask timeout.. + /// + public static string RunAutomatTask_timeout_DOT_ { + get { + return ResourceManager.GetString("RunAutomatTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ScrewClockwiseTask timeout.. + /// + public static string ScrewClockwiseTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ScrewClockwiseTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ScrewCounterClockwiseTask timeout.. + /// + public static string ScrewCounterClockwiseTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ScrewCounterClockwiseTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SetScrewingProgramTask timeout.. + /// + public static string SetScrewingProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("SetScrewingProgramTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.de.resx b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..a781b9fc9 --- /dev/null +++ b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.de.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DisableTask Zeitüberschreitung. + + + EnableTask Zeitüberschreitung. + + + DisableClockwiseTask Zeitüberschreitung. + + + EnableClockwiseTask Zeitüberschreitung. + + + DisableCounterClockwiseTask Zeitüberschreitung. + + + EnableCounterClockwiseTask Zeitüberschreitung. + + + ResetFaultTask Zeitüberschreitung. + + + ResetResultsTask Zeitüberschreitung. + + + SetScrewingProgramTask Zeitüberschreitung. + + + GetScrewingResultsTask Zeitüberschreitung. + + + ScrewClockwiseTask timeout. + + + ScrewCounterClockwiseTask timeout. + + + RunAutomatTask-Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.es.resx b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..79c342a89 --- /dev/null +++ b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.es.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de DisableTask. + + + Tiempo de espera de EnableTask. + + + Tiempo de espera de DisableClockwiseTask. + + + Tiempo de espera de EnableClockwiseTask. + + + Tiempo de espera de DisableCounterClockwiseTask. + + + Tiempo de espera de EnableCounterClockwiseTask. + + + Tiempo de espera de ResetFaultTask. + + + Tiempo de espera de ResetResultsTask. + + + SetScrewingProgramTask tiempo de espera. + + + Tiempo de espera de GetScrewingResultsTask. + + + Tiempo de espera de ScrewClockwiseTask. + + + Tiempo de espera de ScrewCounterClockwiseTask. + + + Tiempo de espera de RunAutomatTask. + + \ No newline at end of file diff --git a/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.resx b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.resx index e8ae276d9..3041a64d5 100644 --- a/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.resx +++ b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.resx @@ -58,4 +58,56 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DisableTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,1768 + + + EnableTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,1827 + + + DisableClockwiseTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,1887 + + + EnableClockwiseTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,1947 + + + DisableCounterClockwiseTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,2007 + + + EnableCounterClockwiseTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,2067 + + + ResetFaultTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,2162 + + + ResetResultsTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,2221 + + + SetScrewingProgramTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,2321 + + + GetScrewingResultsTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,2393 + + + ScrewClockwiseTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,2611 + + + ScrewCounterClockwiseTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,2824 + + + RunAutomatTask timeout. + src\Axo_CS351_compact\Axo_CS351_compact.st,3196 + \ No newline at end of file diff --git a/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.sk.resx b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..7a2008d9a --- /dev/null +++ b/src/components.rexroth.tightening/src/AXOpen.Components.Rexroth.Tightening/Resources/PlcStringResources.sk.resx @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit DisableTask. + + + Časový limit EnableTask. + + + Časový limit DisableClockwiseTask. + + + Časový limit EnableClockwiseTask. + + + DisableCounterClockwiseTask timeout. + + + EnableCounterClockwiseTask timeout. + + + Časový limit ResetFaultTask. + + + Časový limit ResetResultsTask. + + + Časový limit SetScrewingProgramTask. + + + Časový limit úlohy GetScrewingResultsTask. + + + ScrewClockwiseTask timeout. + + + ScrewCounterClockwiseTask timeout. + + + Časový limit úlohy RunAutomatTask. + + \ No newline at end of file diff --git a/src/components.siem.communication/ctrl/src/AxoCmPtp/AxoCmPtp.st b/src/components.siem.communication/ctrl/src/AxoCmPtp/AxoCmPtp.st index 0f401a950..5b68cce49 100644 --- a/src/components.siem.communication/ctrl/src/AxoCmPtp/AxoCmPtp.st +++ b/src/components.siem.communication/ctrl/src/AxoCmPtp/AxoCmPtp.st @@ -298,7 +298,7 @@ NAMESPACE AXOpen.Components.Siem.Communication IF _portConfig.error THEN TaskMessenger.Activate( TO_UINT(_portConfig.status), eAxoMessageCategory#Error); Status.Error.Id := TO_UINT(_portConfig.status); - PortConfigTask.ThrowWhen(TRUE,'PortConfigTask error.'); + PortConfigTask.ThrowWhen(TRUE,'<#PortConfigTask error.#>'); END_IF; END_IF; @@ -409,7 +409,7 @@ NAMESPACE AXOpen.Components.Siem.Communication PortConfigTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - PortConfigTask.ThrowWhen(PortConfigTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'PortConfigTask timeout.'); + PortConfigTask.ThrowWhen(PortConfigTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#PortConfigTask timeout.#>'); END_IF; IF PortConfigTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -461,7 +461,7 @@ NAMESPACE AXOpen.Components.Siem.Communication IF _receiveReset.error THEN TaskMessenger.Activate( TO_UINT(_receiveReset.status), eAxoMessageCategory#Error); Status.Error.Id := TO_UINT(_receiveReset.status); - ReceiveResetTask.ThrowWhen(TRUE,'ReceiveResetTask error.'); + ReceiveResetTask.ThrowWhen(TRUE,'<#ReceiveResetTask error.#>'); END_IF; END_IF; @@ -572,7 +572,7 @@ NAMESPACE AXOpen.Components.Siem.Communication ReceiveResetTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ReceiveResetTask.ThrowWhen(ReceiveResetTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReceiveResetTask timeout.'); + ReceiveResetTask.ThrowWhen(ReceiveResetTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReceiveResetTask timeout.#>'); END_IF; IF ReceiveResetTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -628,7 +628,7 @@ NAMESPACE AXOpen.Components.Siem.Communication IF _sendP2P.error THEN TaskMessenger.Activate( TO_UINT(_sendP2P.status), eAxoMessageCategory#Error); Status.Error.Id := TO_UINT(_sendP2P.status); - SendDataTask.ThrowWhen(TRUE,'SendDataTask error.'); + SendDataTask.ThrowWhen(TRUE,'<#SendDataTask error.#>'); END_IF; END_IF; @@ -739,7 +739,7 @@ NAMESPACE AXOpen.Components.Siem.Communication SendDataTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - SendDataTask.ThrowWhen(SendDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'SendDataTask timeout.'); + SendDataTask.ThrowWhen(SendDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#SendDataTask timeout.#>'); END_IF; IF SendDataTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -901,7 +901,7 @@ NAMESPACE AXOpen.Components.Siem.Communication TemplateTask_10steps_4.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_4.ThrowWhen(TemplateTask_10steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_4 timeout.'); + TemplateTask_10steps_4.ThrowWhen(TemplateTask_10steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_4 timeout.#>'); END_IF; IF TemplateTask_10steps_4.DoneReached() THEN Status.Action.Id := UINT#131; @@ -1054,7 +1054,7 @@ NAMESPACE AXOpen.Components.Siem.Communication TemplateTask_10steps_5.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_5.ThrowWhen(TemplateTask_10steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_5 timeout.'); + TemplateTask_10steps_5.ThrowWhen(TemplateTask_10steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_5 timeout.#>'); END_IF; IF TemplateTask_10steps_5.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1207,7 +1207,7 @@ NAMESPACE AXOpen.Components.Siem.Communication TemplateTask_10steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_6 timeout.'); + TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_6 timeout.#>'); END_IF; IF TemplateTask_10steps_6.DoneReached() THEN Status.Action.Id := UINT#151; @@ -1481,7 +1481,7 @@ NAMESPACE AXOpen.Components.Siem.Communication TemplateTask_20steps_1.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_1 timeout.'); + TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_1 timeout.#>'); END_IF; IF TemplateTask_20steps_1.DoneReached() THEN Status.Action.Id := UINT#161; @@ -1753,7 +1753,7 @@ NAMESPACE AXOpen.Components.Siem.Communication THIS.CallTimers(TRUE); TemplateTask_20steps_2.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_2 timeout.'); + TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_2 timeout.#>'); END_IF; IF TemplateTask_20steps_2.DoneReached() THEN Status.Action.Id := UINT#181; @@ -2026,7 +2026,7 @@ NAMESPACE AXOpen.Components.Siem.Communication TemplateTask_20steps_3.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_3 timeout.'); + TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_3 timeout.#>'); END_IF; IF TemplateTask_20steps_3.DoneReached() THEN Status.Action.Id := UINT#201; @@ -2299,7 +2299,7 @@ NAMESPACE AXOpen.Components.Siem.Communication TemplateTask_20steps_4.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_4 timeout.'); + TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_4 timeout.#>'); END_IF; IF TemplateTask_20steps_4.DoneReached() THEN Status.Action.Id := UINT#221; @@ -2572,7 +2572,7 @@ NAMESPACE AXOpen.Components.Siem.Communication TemplateTask_20steps_5.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_5 timeout.'); + TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_5 timeout.#>'); END_IF; IF TemplateTask_20steps_5.DoneReached() THEN Status.Action.Id := UINT#241; @@ -2845,7 +2845,7 @@ NAMESPACE AXOpen.Components.Siem.Communication TemplateTask_20steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_6 timeout.'); + TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_6 timeout.#>'); END_IF; IF TemplateTask_20steps_6.DoneReached() THEN Status.Action.Id := UINT#261; diff --git a/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.Designer.cs b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.Designer.cs new file mode 100644 index 000000000..83f20806e --- /dev/null +++ b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.Designer.cs @@ -0,0 +1,198 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace AXOpen.Components.Siem.Communication.Resources { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class PlcStringResources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal PlcStringResources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AXOpen.Components.Siem.Communication.Resources.PlcStringResources", typeof(PlcStringResources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to PortConfigTask error.. + /// + public static string PortConfigTask_error_DOT_ { + get { + return ResourceManager.GetString("PortConfigTask_error_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PortConfigTask timeout.. + /// + public static string PortConfigTask_timeout_DOT_ { + get { + return ResourceManager.GetString("PortConfigTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReceiveResetTask error.. + /// + public static string ReceiveResetTask_error_DOT_ { + get { + return ResourceManager.GetString("ReceiveResetTask_error_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReceiveResetTask timeout.. + /// + public static string ReceiveResetTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ReceiveResetTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SendDataTask error.. + /// + public static string SendDataTask_error_DOT_ { + get { + return ResourceManager.GetString("SendDataTask_error_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SendDataTask timeout.. + /// + public static string SendDataTask_timeout_DOT_ { + get { + return ResourceManager.GetString("SendDataTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_5 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_4 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_5 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_4 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_1 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_3 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_2 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_", resourceCulture); + } + } + } +} diff --git a/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.de.resx b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..1dc460cc5 --- /dev/null +++ b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.de.resx @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PortConfigTask-Fehler. + + + PortConfigTask Zeitüberschreitung. + + + ReceiveResetTask-Fehler. + + + Zeitüberschreitung bei ReceiveResetTask. + + + SendDataTask-Fehler. + + + SendDataTask Zeitüberschreitung. + + + TemplateTask10steps4 Zeitüberschreitung. + + + TemplateTask10steps5 Zeitüberschreitung. + + + TemplateTask10steps6 Zeitüberschreitung. + + + TemplateTask20steps1 Zeitüberschreitung. + + + TemplateTask20steps2 Zeitüberschreitung. + + + TemplateTask20steps3 Zeitüberschreitung. + + + TemplateTask20steps4 Zeitüberschreitung. + + + TemplateTask20steps5 Zeitüberschreitung. + + + TemplateTask20steps6 Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.es.resx b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..07fcbf542 --- /dev/null +++ b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.es.resx @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Error de PortConfigTask. + + + Tiempo de espera de PortConfigTask. + + + Error ReceiveResetTask. + + + Tiempo de espera de ReceiveResetTask. + + + Error de SendDataTask. + + + Tiempo de espera de SendDataTask. + + + Tiempo de espera de TemplateTask10steps4. + + + Tiempo de espera de TemplateTask10steps5. + + + Tiempo de espera de TemplateTask10steps6. + + + Tiempo de espera de TemplateTask20steps1. + + + Tiempo de espera de TemplateTask20steps2. + + + Tiempo de espera de TemplateTask20steps3. + + + Tiempo de espera de TemplateTask20steps4. + + + Tiempo de espera de TemplateTask20steps5. + + + Tiempo de espera de TemplateTask20steps6. + + \ No newline at end of file diff --git a/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.resx b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.resx new file mode 100644 index 000000000..269b4357b --- /dev/null +++ b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.resx @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PortConfigTask error. + src\AxoCmPtp\AxoCmPtp.st,300 + + + PortConfigTask timeout. + src\AxoCmPtp\AxoCmPtp.st,411 + + + ReceiveResetTask error. + src\AxoCmPtp\AxoCmPtp.st,463 + + + ReceiveResetTask timeout. + src\AxoCmPtp\AxoCmPtp.st,574 + + + SendDataTask error. + src\AxoCmPtp\AxoCmPtp.st,630 + + + SendDataTask timeout. + src\AxoCmPtp\AxoCmPtp.st,741 + + + TemplateTask_10steps_4 timeout. + src\AxoCmPtp\AxoCmPtp.st,903 + + + TemplateTask_10steps_5 timeout. + src\AxoCmPtp\AxoCmPtp.st,1056 + + + TemplateTask_10steps_6 timeout. + src\AxoCmPtp\AxoCmPtp.st,1209 + + + TemplateTask_20steps_1 timeout. + src\AxoCmPtp\AxoCmPtp.st,1483 + + + TemplateTask_20steps_2 timeout. + src\AxoCmPtp\AxoCmPtp.st,1755 + + + TemplateTask_20steps_3 timeout. + src\AxoCmPtp\AxoCmPtp.st,2028 + + + TemplateTask_20steps_4 timeout. + src\AxoCmPtp\AxoCmPtp.st,2301 + + + TemplateTask_20steps_5 timeout. + src\AxoCmPtp\AxoCmPtp.st,2574 + + + TemplateTask_20steps_6 timeout. + src\AxoCmPtp\AxoCmPtp.st,2847 + + \ No newline at end of file diff --git a/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.sk.resx b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..8248aa933 --- /dev/null +++ b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/Resources/PlcStringResources.sk.resx @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Chyba úlohy PortConfigTask. + + + Časový limit úlohy PortConfigTask. + + + Chyba ReceiveResetTask. + + + Časový limit ReceiveResetTask. + + + Chyba SendDataTask. + + + Časový limit SendDataTask. + + + TemplateTask10steps4 timeout. + + + TemplateTask10steps5 timeout. + + + TemplateTask10steps6 timeout. + + + TemplateTask20steps1 timeout. + + + TemplateTask20steps2 timeout. + + + TemplateTask20steps3 timeout. + + + TemplateTask20steps4 timeout. + + + TemplateTask20steps5 timeout. + + + TemplateTask20steps6 timeout. + + \ No newline at end of file diff --git a/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/inxton_axopen_components_siem_communication.csproj b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/inxton_axopen_components_siem_communication.csproj index 29d870ae5..bf2f7d69a 100644 --- a/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/inxton_axopen_components_siem_communication.csproj +++ b/src/components.siem.communication/src/AXOpen.Components.Siem.Communication/inxton_axopen_components_siem_communication.csproj @@ -63,10 +63,6 @@ - - - - True diff --git a/src/components.siem.identification/ctrl/src/AxoSimaticIdentCyclic/AxoSimaticIdentCyclic.st b/src/components.siem.identification/ctrl/src/AxoSimaticIdentCyclic/AxoSimaticIdentCyclic.st index 5f2f40c3f..b7f9ae90a 100644 --- a/src/components.siem.identification/ctrl/src/AxoSimaticIdentCyclic/AxoSimaticIdentCyclic.st +++ b/src/components.siem.identification/ctrl/src/AxoSimaticIdentCyclic/AxoSimaticIdentCyclic.st @@ -713,7 +713,7 @@ NAMESPACE AXOpen.Components.Siem.Identification ReadUID_Task.ThrowWhen(_errorTimer.output OR Inputs.Status.ERROR_STARTUP); Status.Action.Id := TO_UINT(_progress); - ReadUID_Task.ThrowWhen(ReadUID_Task.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadUID_Task timeout.'); + ReadUID_Task.ThrowWhen(ReadUID_Task.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadUID_Task timeout.#>'); END_IF; IF ReadUID_Task.DoneReached() THEN Status.Action.Id := UINT#101; @@ -897,7 +897,7 @@ NAMESPACE AXOpen.Components.Siem.Identification ReadTagFieldTask.ThrowWhen(_errorTimer.output OR Inputs.Status.ERROR_STARTUP); Status.Action.Id := TO_UINT(_progress); - ReadTagFieldTask.ThrowWhen(ReadTagFieldTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadTagFieldTask timeout.'); + ReadTagFieldTask.ThrowWhen(ReadTagFieldTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadTagFieldTask timeout.#>'); END_IF; IF ReadTagFieldTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -1102,7 +1102,7 @@ NAMESPACE AXOpen.Components.Siem.Identification WriteTagFieldTask.ThrowWhen(_errorTimer.output OR Inputs.Status.ERROR_STARTUP); Status.Action.Id := TO_UINT(_progress); - WriteTagFieldTask.ThrowWhen(WriteTagFieldTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'WriteTagFieldTask timeout.'); + WriteTagFieldTask.ThrowWhen(WriteTagFieldTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#WriteTagFieldTask timeout.#>'); END_IF; IF WriteTagFieldTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -1297,7 +1297,7 @@ NAMESPACE AXOpen.Components.Siem.Identification ReadTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadTask timeout.'); + ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadTask timeout.#>'); END_IF; IF ReadTask.DoneReached() THEN Status.Action.Id := UINT#131; @@ -1510,7 +1510,7 @@ NAMESPACE AXOpen.Components.Siem.Identification WriteTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - WriteTask.ThrowWhen(WriteTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'WriteTask timeout.'); + WriteTask.ThrowWhen(WriteTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#WriteTask timeout.#>'); END_IF; IF WriteTask.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1673,7 +1673,7 @@ NAMESPACE AXOpen.Components.Siem.Identification ResetTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ResetTask.ThrowWhen(ResetTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ResetTask timeout.'); + ResetTask.ThrowWhen(ResetTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ResetTask timeout.#>'); END_IF; IF ResetTask.DoneReached() THEN Status.Action.Id := UINT#151; @@ -1947,7 +1947,7 @@ NAMESPACE AXOpen.Components.Siem.Identification TemplateTask_20steps_1.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_1 timeout.'); + TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_1 timeout.#>'); END_IF; IF TemplateTask_20steps_1.DoneReached() THEN Status.Action.Id := UINT#161; @@ -2220,7 +2220,7 @@ NAMESPACE AXOpen.Components.Siem.Identification TemplateTask_20steps_2.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_2 timeout.'); + TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_2 timeout.#>'); END_IF; IF TemplateTask_20steps_2.DoneReached() THEN Status.Action.Id := UINT#181; @@ -2493,7 +2493,7 @@ NAMESPACE AXOpen.Components.Siem.Identification TemplateTask_20steps_3.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_3 timeout.'); + TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_3 timeout.#>'); END_IF; IF TemplateTask_20steps_3.DoneReached() THEN Status.Action.Id := UINT#201; @@ -2766,7 +2766,7 @@ NAMESPACE AXOpen.Components.Siem.Identification TemplateTask_20steps_4.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_4 timeout.'); + TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_4 timeout.#>'); END_IF; IF TemplateTask_20steps_4.DoneReached() THEN Status.Action.Id := UINT#221; @@ -3039,7 +3039,7 @@ NAMESPACE AXOpen.Components.Siem.Identification TemplateTask_20steps_5.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_5 timeout.'); + TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_5 timeout.#>'); END_IF; IF TemplateTask_20steps_5.DoneReached() THEN Status.Action.Id := UINT#241; @@ -3312,7 +3312,7 @@ NAMESPACE AXOpen.Components.Siem.Identification TemplateTask_20steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_6 timeout.'); + TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_6 timeout.#>'); END_IF; IF TemplateTask_20steps_6.DoneReached() THEN Status.Action.Id := UINT#261; diff --git a/src/components.siem.identification/ctrl/src/IOLink/AxoIOLink_RF200Device.st b/src/components.siem.identification/ctrl/src/IOLink/AxoIOLink_RF200Device.st index d1e838c6e..4d7326468 100644 --- a/src/components.siem.identification/ctrl/src/IOLink/AxoIOLink_RF200Device.st +++ b/src/components.siem.identification/ctrl/src/IOLink/AxoIOLink_RF200Device.st @@ -305,7 +305,7 @@ NAMESPACE AXOpen.Components.Siem.Identification THIS.CallTimers(FALSE); _progress:=301; END_IF; - ReadTagTask.ThrowWhen(_switchAntenna_error,'Error when switching the antena On' ); + ReadTagTask.ThrowWhen(_switchAntenna_error,'<#Error when switching the antena On#>'); END_IF; IF _progress = 301 THEN @@ -346,7 +346,7 @@ NAMESPACE AXOpen.Components.Siem.Identification THIS.CallTimers(FALSE); _progress:=304; END_IF; - ReadTagTask.ThrowWhen(_readTag_error,'Error reading tag'); + ReadTagTask.ThrowWhen(_readTag_error,'<#Error reading tag#>'); END_IF; IF _progress = 304 THEN @@ -434,7 +434,7 @@ NAMESPACE AXOpen.Components.Siem.Identification THIS.CallTimers(FALSE); _progress:=321; END_IF; - WriteTagTask.ThrowWhen(_switchAntenna_error,'Error when switching the antena On' ); + WriteTagTask.ThrowWhen(_switchAntenna_error,'<#Error when switching the antena On#>'); END_IF; IF _progress = 321 THEN @@ -475,7 +475,7 @@ NAMESPACE AXOpen.Components.Siem.Identification THIS.CallTimers(FALSE); _progress:=324; END_IF; - WriteTagTask.ThrowWhen(_writeTag_error,'Error writing tag'); + WriteTagTask.ThrowWhen(_writeTag_error,'<#Error writing tag#>'); END_IF; IF _progress = 324 THEN diff --git a/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.Designer.cs b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.Designer.cs index f3d4866bc..a97a42e46 100644 --- a/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.Designer.cs +++ b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,140 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to Error reading tag. + /// + public static string Error_reading_tag { + get { + return ResourceManager.GetString("Error_reading_tag", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error when switching the antena On. + /// + public static string Error_when_switching_the_antena_On { + get { + return ResourceManager.GetString("Error_when_switching_the_antena_On", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error writing tag. + /// + public static string Error_writing_tag { + get { + return ResourceManager.GetString("Error_writing_tag", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReadTagFieldTask timeout.. + /// + public static string ReadTagFieldTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ReadTagFieldTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReadTask timeout.. + /// + public static string ReadTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ReadTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReadUID_Task timeout.. + /// + public static string ReadUID_UNDERSCORE_Task_timeout_DOT_ { + get { + return ResourceManager.GetString("ReadUID_UNDERSCORE_Task_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ResetTask timeout.. + /// + public static string ResetTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ResetTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_5 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_4 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_1 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_3 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_2 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WriteTagFieldTask timeout.. + /// + public static string WriteTagFieldTask_timeout_DOT_ { + get { + return ResourceManager.GetString("WriteTagFieldTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WriteTask timeout.. + /// + public static string WriteTask_timeout_DOT_ { + get { + return ResourceManager.GetString("WriteTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.de.resx b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..6cfd262de --- /dev/null +++ b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.de.resx @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ReadUIDTask Zeitüberschreitung. + + + ReadTagFieldTask Zeitüberschreitung. + + + WriteTagFieldTask Zeitüberschreitung. + + + ReadTask Zeitüberschreitung. + + + WriteTask Zeitüberschreitung. + + + ResetTask Zeitüberschreitung. + + + TemplateTask20steps1 Zeitüberschreitung. + + + TemplateTask20steps2 Zeitüberschreitung. + + + TemplateTask20steps3 Zeitüberschreitung. + + + TemplateTask20steps4 Zeitüberschreitung. + + + TemplateTask20steps5 Zeitüberschreitung. + + + TemplateTask20steps6 Zeitüberschreitung. + + + Fehler beim Einschalten der Antenne + + + Fehler beim Lesen des Tags + + + Fehler beim Schreiben des Tags + + \ No newline at end of file diff --git a/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.es.resx b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..e251a34ab --- /dev/null +++ b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.es.resx @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de ReadUIDTask. + + + Tiempo de espera de ReadTagFieldTask. + + + Tiempo de espera de WriteTagFieldTask. + + + Tiempo de espera de ReadTask. + + + Tiempo de espera de WriteTask. + + + Tiempo de espera de ResetTask. + + + Tiempo de espera de TemplateTask20steps1. + + + Tiempo de espera de TemplateTask20steps2. + + + Tiempo de espera de TemplateTask20steps3. + + + Tiempo de espera de TemplateTask20steps4. + + + Tiempo de espera de TemplateTask20steps5. + + + Tiempo de espera de TemplateTask20steps6. + + + Error al encender la antena + + + Error de lectura de la etiqueta + + + Error al escribir la etiqueta + + \ No newline at end of file diff --git a/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.resx b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.resx index e8ae276d9..7b4369943 100644 --- a/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.resx +++ b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.resx @@ -58,4 +58,64 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ReadUID_Task timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,715 + + + ReadTagFieldTask timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,899 + + + WriteTagFieldTask timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,1104 + + + ReadTask timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,1299 + + + WriteTask timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,1512 + + + ResetTask timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,1675 + + + TemplateTask_20steps_1 timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,1949 + + + TemplateTask_20steps_2 timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,2222 + + + TemplateTask_20steps_3 timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,2495 + + + TemplateTask_20steps_4 timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,2768 + + + TemplateTask_20steps_5 timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,3041 + + + TemplateTask_20steps_6 timeout. + src\AxoSimaticIdentCyclic\AxoSimaticIdentCyclic.st,3314 + + + Error when switching the antena On + src\IOLink\AxoIOLink_RF200Device.st,307 + + + Error reading tag + src\IOLink\AxoIOLink_RF200Device.st,348 + + + Error writing tag + src\IOLink\AxoIOLink_RF200Device.st,477 + \ No newline at end of file diff --git a/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.sk.resx b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..73f67f7b3 --- /dev/null +++ b/src/components.siem.identification/src/AXOpen.Components.Siem.Identification/Resources/PlcStringResources.sk.resx @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit ReadUIDTask. + + + Časový limit úlohy ReadTagFieldTask. + + + Časový limit úlohy WriteTagFieldTask. + + + Časový limit ReadTask. + + + Časový limit úlohy WriteTask. + + + Časový limit ResetTask. + + + TemplateTask20steps1 timeout. + + + TemplateTask20steps2 timeout. + + + TemplateTask20steps3 timeout. + + + TemplateTask20steps4 timeout. + + + TemplateTask20steps5 timeout. + + + TemplateTask20steps6 timeout. + + + Chyba pri zapnutí antény + + + Chyba pri čítaní značky + + + Chyba pri zápise značky + + \ No newline at end of file diff --git a/src/components.ur.robotics/ctrl/src/AxoUrCb3/AxoUrCb3_v_3_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/AxoUrCb3_v_3_x_x.st index c542043c9..7f317491d 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrCb3/AxoUrCb3_v_3_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/AxoUrCb3_v_3_x_x.st @@ -1611,7 +1611,7 @@ NAMESPACE AXOpen.Components.Ur.Robotics THIS.CallTimers(TRUE); StartAtMainTask.ThrowWhen(_errorTimer.output ); Status.Action.Id := TO_UINT(_power_progress); - StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartAtMainTask timeout.'); + StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartAtMainTask timeout.#>'); END_IF; IF StartAtMainTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -1787,7 +1787,7 @@ NAMESPACE AXOpen.Components.Ur.Robotics THIS.CallTimers(TRUE); StartMotorsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMotorsAndProgramTask timeout.'); + StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsAndProgramTask timeout.#>'); END_IF; IF StartMotorsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -1967,7 +1967,7 @@ NAMESPACE AXOpen.Components.Ur.Robotics StartMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_movement_progress); - StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StartMovementsTask timeout.'); + StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMovementsTask timeout.#>'); END_IF; IF StartMovementsTask.DoneReached() THEN Status.Action.Id := UINT#181; @@ -2045,7 +2045,7 @@ NAMESPACE AXOpen.Components.Ur.Robotics THIS.CallTimers(TRUE); StopMovementsAndProgramTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsAndProgramTask timeout.'); + StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsAndProgramTask timeout.#>'); END_IF; IF StopMovementsAndProgramTask.DoneReached() THEN Status.Action.Id := UINT#211; @@ -2123,7 +2123,7 @@ NAMESPACE AXOpen.Components.Ur.Robotics THIS.CallTimers(TRUE); StopMovementsTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_power_progress); - StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'StopMovementsTask timeout.'); + StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsTask timeout.#>'); END_IF; IF StopMovementsTask.DoneReached() THEN Status.Action.Id := UINT#221; diff --git a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.Designer.cs b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.Designer.cs index 4234a977b..9e375b346 100644 --- a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.Designer.cs +++ b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.Designer.cs @@ -59,5 +59,50 @@ internal PlcStringResources() { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to StartAtMainTask timeout.. + /// + public static string StartAtMainTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartAtMainTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMotorsAndProgramTask timeout.. + /// + public static string StartMotorsAndProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMotorsAndProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StartMovementsTask timeout.. + /// + public static string StartMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StartMovementsTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMovementsAndProgramTask timeout.. + /// + public static string StopMovementsAndProgramTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMovementsAndProgramTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to StopMovementsTask timeout.. + /// + public static string StopMovementsTask_timeout_DOT_ { + get { + return ResourceManager.GetString("StopMovementsTask_timeout_DOT_", resourceCulture); + } + } } } diff --git a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.de.resx b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..0efbb5940 --- /dev/null +++ b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.de.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + StartAtMainTask-Zeitüberschreitung. + + + StartMotorsAndProgramTask Zeitüberschreitung. + + + StartMovementsTask Zeitüberschreitung. + + + StopMovementsAndProgramTask timeout. + + + StopMovementsTask Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.es.resx b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..d8b1752ff --- /dev/null +++ b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.es.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de StartAtMainTask. + + + Tiempo de espera de StartMotorsAndProgramTask. + + + Tiempo de espera de StartMovementsTask. + + + Tiempo de espera de StopMovementsAndProgramTask. + + + Tiempo de espera de StopMovementsTask. + + \ No newline at end of file diff --git a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.resx b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.resx index e8ae276d9..5b00d601b 100644 --- a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.resx +++ b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.resx @@ -58,4 +58,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StartAtMainTask timeout. + src\AxoUrCb3\AxoUrCb3_v_3_x_x.st,1613 + + + StartMotorsAndProgramTask timeout. + src\AxoUrCb3\AxoUrCb3_v_3_x_x.st,1789 + + + StartMovementsTask timeout. + src\AxoUrCb3\AxoUrCb3_v_3_x_x.st,1969 + + + StopMovementsAndProgramTask timeout. + src\AxoUrCb3\AxoUrCb3_v_3_x_x.st,2047 + + + StopMovementsTask timeout. + src\AxoUrCb3\AxoUrCb3_v_3_x_x.st,2125 + \ No newline at end of file diff --git a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.sk.resx b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..ab5c580c1 --- /dev/null +++ b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/Resources/PlcStringResources.sk.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit StartAtMainTask. + + + Časový limit StartMotorsAndProgramTask. + + + Časový limit StartMovementsTask. + + + StopMovementsAndProgramTask timeout. + + + StopMovementsTask timeout. + + \ No newline at end of file diff --git a/src/components.zebra.vision/ctrl/src/AxoEA3600/AxoEA3600.st b/src/components.zebra.vision/ctrl/src/AxoEA3600/AxoEA3600.st index 3e51f9984..2819bb320 100644 --- a/src/components.zebra.vision/ctrl/src/AxoEA3600/AxoEA3600.st +++ b/src/components.zebra.vision/ctrl/src/AxoEA3600/AxoEA3600.st @@ -550,7 +550,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision ReadTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ReadTask timeout.'); + ReadTask.ThrowWhen(ReadTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ReadTask timeout.#>'); END_IF; IF ReadTask.DoneReached() THEN Status.Action.Id := UINT#101; @@ -724,7 +724,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision ClearDataTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ClearDataTask.ThrowWhen(ClearDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ClearDataTask timeout.'); + ClearDataTask.ThrowWhen(ClearDataTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ClearDataTask timeout.#>'); END_IF; IF ClearDataTask.DoneReached() THEN Status.Action.Id := UINT#111; @@ -879,7 +879,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision ClearErrorTask.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - ClearErrorTask.ThrowWhen(ClearErrorTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'ClearErrorTask timeout.'); + ClearErrorTask.ThrowWhen(ClearErrorTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ClearErrorTask timeout.#>'); END_IF; IF ClearErrorTask.DoneReached() THEN Status.Action.Id := UINT#121; @@ -1032,7 +1032,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision TemplateTask_10steps_4.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_4.ThrowWhen(TemplateTask_10steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_4 timeout.'); + TemplateTask_10steps_4.ThrowWhen(TemplateTask_10steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_4 timeout.#>'); END_IF; IF TemplateTask_10steps_4.DoneReached() THEN Status.Action.Id := UINT#131; @@ -1185,7 +1185,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision TemplateTask_10steps_5.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_5.ThrowWhen(TemplateTask_10steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_5 timeout.'); + TemplateTask_10steps_5.ThrowWhen(TemplateTask_10steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_5 timeout.#>'); END_IF; IF TemplateTask_10steps_5.DoneReached() THEN Status.Action.Id := UINT#141; @@ -1338,7 +1338,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision TemplateTask_10steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_10steps_6 timeout.'); + TemplateTask_10steps_6.ThrowWhen(TemplateTask_10steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_10steps_6 timeout.#>'); END_IF; IF TemplateTask_10steps_6.DoneReached() THEN Status.Action.Id := UINT#151; @@ -1612,7 +1612,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision TemplateTask_20steps_1.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_1 timeout.'); + TemplateTask_20steps_1.ThrowWhen(TemplateTask_20steps_1.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_1 timeout.#>'); END_IF; IF TemplateTask_20steps_1.DoneReached() THEN Status.Action.Id := UINT#161; @@ -1884,7 +1884,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision THIS.CallTimers(TRUE); TemplateTask_20steps_2.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_2 timeout.'); + TemplateTask_20steps_2.ThrowWhen(TemplateTask_20steps_2.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_2 timeout.#>'); END_IF; IF TemplateTask_20steps_2.DoneReached() THEN Status.Action.Id := UINT#181; @@ -2157,7 +2157,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision TemplateTask_20steps_3.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_3 timeout.'); + TemplateTask_20steps_3.ThrowWhen(TemplateTask_20steps_3.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_3 timeout.#>'); END_IF; IF TemplateTask_20steps_3.DoneReached() THEN Status.Action.Id := UINT#201; @@ -2430,7 +2430,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision TemplateTask_20steps_4.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_4 timeout.'); + TemplateTask_20steps_4.ThrowWhen(TemplateTask_20steps_4.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_4 timeout.#>'); END_IF; IF TemplateTask_20steps_4.DoneReached() THEN Status.Action.Id := UINT#221; @@ -2703,7 +2703,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision TemplateTask_20steps_5.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_5 timeout.'); + TemplateTask_20steps_5.ThrowWhen(TemplateTask_20steps_5.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_5 timeout.#>'); END_IF; IF TemplateTask_20steps_5.DoneReached() THEN Status.Action.Id := UINT#241; @@ -2976,7 +2976,7 @@ NAMESPACE AXOpen.Components.Zebra.Vision TemplateTask_20steps_6.ThrowWhen(_errorTimer.output); Status.Action.Id := TO_UINT(_progress); - TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'TemplateTask_20steps_6 timeout.'); + TemplateTask_20steps_6.ThrowWhen(TemplateTask_20steps_6.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#TemplateTask_20steps_6 timeout.#>'); END_IF; IF TemplateTask_20steps_6.DoneReached() THEN Status.Action.Id := UINT#261; diff --git a/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.Designer.cs b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.Designer.cs new file mode 100644 index 000000000..14786f1e9 --- /dev/null +++ b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.Designer.cs @@ -0,0 +1,171 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace AXOpen.Components.Zebra.Vision.Resources { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class PlcStringResources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal PlcStringResources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AXOpen.Components.Zebra.Vision.Resources.PlcStringResources", typeof(PlcStringResources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to ClearDataTask timeout.. + /// + public static string ClearDataTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ClearDataTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ClearErrorTask timeout.. + /// + public static string ClearErrorTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ClearErrorTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ReadTask timeout.. + /// + public static string ReadTask_timeout_DOT_ { + get { + return ResourceManager.GetString("ReadTask_timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_5 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_4 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_10steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__ONE__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_5 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FIVE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_4 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__FOUR__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_1 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__ONE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_6 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__SIX__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_3 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__THREE__timeout_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TemplateTask_20steps_2 timeout.. + /// + public static string TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_ { + get { + return ResourceManager.GetString("TemplateTask_UNDERSCORE__TWO__ZERO_steps_UNDERSCORE__TWO__timeout_DOT_", resourceCulture); + } + } + } +} diff --git a/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.de.resx b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.de.resx new file mode 100644 index 000000000..001443938 --- /dev/null +++ b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.de.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ReadTask Zeitüberschreitung. + + + ClearDataTask Zeitüberschreitung. + + + ClearErrorTask Zeitüberschreitung. + + + TemplateTask10steps4 Zeitüberschreitung. + + + TemplateTask10steps5 Zeitüberschreitung. + + + TemplateTask10steps6 Zeitüberschreitung. + + + TemplateTask20steps1 Zeitüberschreitung. + + + TemplateTask20steps2 Zeitüberschreitung. + + + TemplateTask20steps3 Zeitüberschreitung. + + + TemplateTask20steps4 Zeitüberschreitung. + + + TemplateTask20steps5 Zeitüberschreitung. + + + TemplateTask20steps6 Zeitüberschreitung. + + \ No newline at end of file diff --git a/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.es.resx b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.es.resx new file mode 100644 index 000000000..38c4f6015 --- /dev/null +++ b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.es.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tiempo de espera de ReadTask. + + + Tiempo de espera de ClearDataTask. + + + Tiempo de espera de ClearErrorTask. + + + Tiempo de espera de TemplateTask10steps4. + + + Tiempo de espera de TemplateTask10steps5. + + + Tiempo de espera de TemplateTask10steps6. + + + Tiempo de espera de TemplateTask20steps1. + + + Tiempo de espera de TemplateTask20steps2. + + + Tiempo de espera de TemplateTask20steps3. + + + Tiempo de espera de TemplateTask20steps4. + + + Tiempo de espera de TemplateTask20steps5. + + + Tiempo de espera de TemplateTask20steps6. + + \ No newline at end of file diff --git a/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.resx b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.resx new file mode 100644 index 000000000..767c5f680 --- /dev/null +++ b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.resx @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ReadTask timeout. + src\AxoEA3600\AxoEA3600.st,552 + + + ClearDataTask timeout. + src\AxoEA3600\AxoEA3600.st,726 + + + ClearErrorTask timeout. + src\AxoEA3600\AxoEA3600.st,881 + + + TemplateTask_10steps_4 timeout. + src\AxoEA3600\AxoEA3600.st,1034 + + + TemplateTask_10steps_5 timeout. + src\AxoEA3600\AxoEA3600.st,1187 + + + TemplateTask_10steps_6 timeout. + src\AxoEA3600\AxoEA3600.st,1340 + + + TemplateTask_20steps_1 timeout. + src\AxoEA3600\AxoEA3600.st,1614 + + + TemplateTask_20steps_2 timeout. + src\AxoEA3600\AxoEA3600.st,1886 + + + TemplateTask_20steps_3 timeout. + src\AxoEA3600\AxoEA3600.st,2159 + + + TemplateTask_20steps_4 timeout. + src\AxoEA3600\AxoEA3600.st,2432 + + + TemplateTask_20steps_5 timeout. + src\AxoEA3600\AxoEA3600.st,2705 + + + TemplateTask_20steps_6 timeout. + src\AxoEA3600\AxoEA3600.st,2978 + + \ No newline at end of file diff --git a/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.sk.resx b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.sk.resx new file mode 100644 index 000000000..9c5a45452 --- /dev/null +++ b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/Resources/PlcStringResources.sk.resx @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Časový limit ReadTask. + + + Časový limit ClearDataTask. + + + Časový limit ClearErrorTask. + + + TemplateTask10steps4 timeout. + + + TemplateTask10steps5 timeout. + + + TemplateTask10steps6 timeout. + + + TemplateTask20steps1 timeout. + + + TemplateTask20steps2 timeout. + + + TemplateTask20steps3 timeout. + + + TemplateTask20steps4 timeout. + + + TemplateTask20steps5 timeout. + + + TemplateTask20steps6 timeout. + + \ No newline at end of file diff --git a/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/inxton_axopen_components_zebra_vision.csproj b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/inxton_axopen_components_zebra_vision.csproj index 20b777e13..72e338f88 100644 --- a/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/inxton_axopen_components_zebra_vision.csproj +++ b/src/components.zebra.vision/src/AXOpen.Components.Zebra.Vision/inxton_axopen_components_zebra_vision.csproj @@ -63,10 +63,6 @@ - - - - True diff --git a/src/core/ctrl/src/AxoAlert/AxoAlert.st b/src/core/ctrl/src/AxoAlert/AxoAlert.st index 43b515003..6679fde20 100644 --- a/src/core/ctrl/src/AxoAlert/AxoAlert.st +++ b/src/core/ctrl/src/AxoAlert/AxoAlert.st @@ -43,7 +43,7 @@ NAMESPACE AXOpen.Core THIS.Restore(); END_IF; - ErrorDetails := 'THE REMOTE TASK IS NOT INITIALIZED'; + ErrorDetails := '<#THE REMOTE TASK IS NOT INITIALIZED#>'; RETURN; // if it continue .Execute() call ThrowWhen() and task go to ErrorState END_IF; diff --git a/src/core/ctrl/src/AxoCoordination/AxoSequencer/AxoSequencer.st b/src/core/ctrl/src/AxoCoordination/AxoSequencer/AxoSequencer.st index f0600d452..455bf584e 100644 --- a/src/core/ctrl/src/AxoCoordination/AxoSequencer/AxoSequencer.st +++ b/src/core/ctrl/src/AxoCoordination/AxoSequencer/AxoSequencer.st @@ -15,12 +15,14 @@ NAMESPACE AXOpen.Core {#ix-set:AttributeName = "<<"} StepBackwardCommand : AxoTask; CurrentStep : AxoStep; - MaxSequenceDuration : LTIME; + MaxSequenceDuration : LTIME; + {S7.extern=Read} + {#ix-attr:[ReadOnly()]} + NumberOfConfiguredSteps : ULINT; END_VAR VAR PRIVATE - _configurationFlowOrder : ULINT; - _numberOfConfiguredSteps : ULINT; + _configurationFlowOrder : ULINT; _coordinatorState : AxoCoordinatorStates; _step : IAxoStep; _openCycleCounter : ULINT; @@ -62,7 +64,7 @@ NAMESPACE AXOpen.Core CASE _coordinatorState OF AxoCoordinatorStates#Idle : _configurationFlowOrder := ULINT#0; - _numberOfConfiguredSteps := ULINT#0; + NumberOfConfiguredSteps := ULINT#0; _coordinatorState := AxoCoordinatorStates#Configuring; StepForwardCommand.Run(THIS); @@ -75,7 +77,7 @@ NAMESPACE AXOpen.Core IF(_analytics <> NULL) THEN _analytics.Restart(); END_IF; _coordinatorState := AxoCoordinatorStates#Running; _taskTimer.Restore(); - _context.GetLogger().Log('Sequence in config state :', AXOpen.Logging.eLogLevel#Verbose, THIS); + _context.GetLogger().Log('<#Sequence in config state :#>', AXOpen.Logging.eLogLevel#Verbose, THIS); END_CASE; Open := TRUE; END_IF; @@ -108,13 +110,13 @@ NAMESPACE AXOpen.Core // Stepping Forwards and Backwards commands cannot be executed simultaneously StepForwardCommand.SetIsDisabled(StepBackwardCommand.IsBusy() // Stepping Forwards disabled from last step - OR CurrentOrder >= _numberOfConfiguredSteps); + OR CurrentOrder >= NumberOfConfiguredSteps); StepBackwardCommand.SetIsDisabled(StepForwardCommand.IsBusy() // Stepping Backwards disabled from first step OR CurrentOrder <= ULINT#1); // StepForward command increments the CurrentOrder just to a maximum value of _numberOfConfiguredSteps IF StepForwardCommand.Execute() THEN - IF CurrentOrder < _numberOfConfiguredSteps THEN + IF CurrentOrder < NumberOfConfiguredSteps THEN THIS.AbortCurrentStep(); CurrentOrder := CurrentOrder + ULINT#1; END_IF; @@ -180,7 +182,7 @@ NAMESPACE AXOpen.Core IF step.GetIsActive() AND (step.IsReady() OR step.IsDone() OR SteppingMode = eAxoSteppingMode#StepByStep) THEN IF (SteppingMode = eAxoSteppingMode#Continous) THEN step.Invoke(); - _context.GetLogger().Log('Starts step :', AXOpen.Logging.eLogLevel#Verbose, step); + _context.GetLogger().Log('<#Starts step :#>', AXOpen.Logging.eLogLevel#Verbose, step); // Invoke the step in a case of step mode when StepIn Command is invoked ELSIF (SteppingMode = eAxoSteppingMode#StepByStep) THEN IF StepIn.Execute() THEN @@ -231,7 +233,7 @@ NAMESPACE AXOpen.Core RETURN; END_IF; IF _coordinatorState = AxoCoordinatorStates#Running THEN - _context.GetLogger().Log('Step done :', AXOpen.Logging.eLogLevel#Verbose, _step); + _context.GetLogger().Log('<#Step done :#>', AXOpen.Logging.eLogLevel#Verbose, _step); _step.DoneWhen(_step.IsBusy()); IF(_analytics <> NULL) THEN _analytics.UpdateAnalytics(CurrentStep); END_IF; _step.SetIsActive(FALSE); @@ -258,7 +260,7 @@ NAMESPACE AXOpen.Core END_IF; IF RequestedStep.GetStepOrder() <> ULINT#0 AND _coordinatorState = AxoCoordinatorStates#Running THEN - _context.GetLogger().Log('Step request to step :', AXOpen.Logging.eLogLevel#Verbose, RequestedStep); + _context.GetLogger().Log('<#Step request to step :#>', AXOpen.Logging.eLogLevel#Verbose, RequestedStep); _step.DoneWhen(_step.IsBusy()); _step.SetIsActive(FALSE); IF(_analytics <> NULL) THEN _analytics.UpdateAnalytics(CurrentStep); END_IF; @@ -290,7 +292,7 @@ NAMESPACE AXOpen.Core // Finalize the StepIn Command in a case of step mode StepIn.DoneWhen(SteppingMode = eAxoSteppingMode#StepByStep); THIS.OnCompleteSequence(); - _context.GetLogger().Log('Sequence completed :', AXOpen.Logging.eLogLevel#Verbose, THIS); + _context.GetLogger().Log('<#Sequence completed :#>', AXOpen.Logging.eLogLevel#Verbose, THIS); END_IF; END_IF; END_METHOD @@ -324,7 +326,7 @@ NAMESPACE AXOpen.Core step.Restore(); _step := step; _configurationFlowOrder := _configurationFlowOrder + ULINT#1; - _numberOfConfiguredSteps := _configurationFlowOrder; + NumberOfConfiguredSteps := _configurationFlowOrder; step.SetStepOrder(THIS,_configurationFlowOrder); IF NOT step.IsCalledJustOnceInThisPlcCycle() THEN @@ -341,8 +343,8 @@ NAMESPACE AXOpen.Core /// METHOD PUBLIC GetNumberOfConfiguredSteps : ULINT IF _coordinatorState = AxoCoordinatorStates#Running THEN - _numberOfConfiguredSteps := _configurationFlowOrder; - GetNumberOfConfiguredSteps := _numberOfConfiguredSteps; + NumberOfConfiguredSteps := _configurationFlowOrder; + GetNumberOfConfiguredSteps := NumberOfConfiguredSteps; ELSE GetNumberOfConfiguredSteps := ULINT#0; END_IF; @@ -370,7 +372,7 @@ NAMESPACE AXOpen.Core METHOD PROTECTED OVERRIDE OnRestore _configurationFlowOrder := ULINT#0; - _numberOfConfiguredSteps := ULINT#0; + NumberOfConfiguredSteps := ULINT#0; _coordinatorState := AxoCoordinatorStates#Idle; END_METHOD diff --git a/src/core/ctrl/src/AxoCoordination/AxoStep/AxoStep.st b/src/core/ctrl/src/AxoCoordination/AxoStep/AxoStep.st index dc9182903..5401779fc 100644 --- a/src/core/ctrl/src/AxoCoordination/AxoStep/AxoStep.st +++ b/src/core/ctrl/src/AxoCoordination/AxoStep/AxoStep.st @@ -171,7 +171,7 @@ NAMESPACE AXOpen.Core _context := THIS.GetContext(); END_IF; IF(NOT THIS.IsActive AND Active) THEN - _context.GetLogger().Log('At step:', AXOpen.Logging.eLogLevel#Verbose, THIS); + _context.GetLogger().Log('<#At step:#>', AXOpen.Logging.eLogLevel#Verbose, THIS); END_IF; IsActive := Active; END_METHOD diff --git a/src/core/ctrl/src/AxoDialog/AxoDialog.st b/src/core/ctrl/src/AxoDialog/AxoDialog.st index 9b98b50cf..db3dca329 100644 --- a/src/core/ctrl/src/AxoDialog/AxoDialog.st +++ b/src/core/ctrl/src/AxoDialog/AxoDialog.st @@ -123,7 +123,7 @@ NAMESPACE AXOpen.Core IF NOT THIS.IsInitialized THEN // dialog is not observed/monitored by server _answer := eDialogAnswer#NoAnswer; // set default value - ErrorDetails := 'THE REMOTE TASK IS NOT INITIALIZED'; + ErrorDetails := '<#THE REMOTE TASK IS NOT INITIALIZED#>'; RETURN; // if it continue .Execute() call ThrowWhen() and task go to ErrorState END_IF; diff --git a/src/core/ctrl/src/AxoMessaging/Static/AxoMessenger.st b/src/core/ctrl/src/AxoMessaging/Static/AxoMessenger.st index 0db75677a..0d4521438 100644 --- a/src/core/ctrl/src/AxoMessaging/Static/AxoMessenger.st +++ b/src/core/ctrl/src/AxoMessaging/Static/AxoMessenger.st @@ -108,7 +108,7 @@ NAMESPACE AXOpen.Messaging.Static Risen := _context.GetRtc().NowUTC(); Fallen := LDATE_AND_TIME#1970-01-01-00:00:00.000; Acknowledged := LDATE_AND_TIME#1970-01-01-00:00:00.000; - _context.GetLogger().Log('Risen', THIS.ToLogLevel(_category), THIS); + _context.GetLogger().Log('<#Risen#>', THIS.ToLogLevel(_category), THIS); MessageCode := _messageCode; Category := _category; // AcknowledgementRequired := Category >= eAxoMessageCategory#Error; @@ -119,7 +119,7 @@ NAMESPACE AXOpen.Messaging.Static Risen := _context.GetRtc().NowUTC(); Fallen := LDATE_AND_TIME#1970-01-01-00:00:00.000; Acknowledged := LDATE_AND_TIME#1970-01-01-00:00:00.000; - _context.GetLogger().Log('Risen again before acknowledgement', THIS.ToLogLevel(_category), THIS); + _context.GetLogger().Log('<#Risen again before acknowledgement#>', THIS.ToLogLevel(_category), THIS); END_IF; IF MessageCode = _messageCode THEN @@ -198,7 +198,7 @@ NAMESPACE AXOpen.Messaging.Static IF MessageCode = _messageCode THEN ActiveContextCount := ULINT#0; Fallen := _context.GetRtc().NowUTC(); - _context.GetLogger().Log('Fallen', eLogLevel#Information, THIS); + _context.GetLogger().Log('<#Fallen#>', eLogLevel#Information, THIS); IF THIS.MessengerState = eAxoMessengerState#ActiveAcknowledgeRequired THEN THIS.MessengerState := eAxoMessengerState#InactiveWaitingForAcknowledge; ELSIF THIS.MessengerState = eAxoMessengerState#ActiveAcknowledgeNotRequired THEN diff --git a/src/core/ctrl/src/AxoRemoteTask/AxoRemoteTask.st b/src/core/ctrl/src/AxoRemoteTask/AxoRemoteTask.st index 41ed3e277..0da91b117 100644 --- a/src/core/ctrl/src/AxoRemoteTask/AxoRemoteTask.st +++ b/src/core/ctrl/src/AxoRemoteTask/AxoRemoteTask.st @@ -42,7 +42,7 @@ NAMESPACE AXOpen.Core IF(Execute) THEN _remoteTaskMessenger.ActivateOnCondition(UINT#1,NOT IsInitialized, AXOpen.Messaging.eAxoMessageCategory#Warning); - //SUPER.ThrowWhen(NOT IsInitialized, 'THE REMOTE TASK IS NOT INITIALIZED'); + //SUPER.ThrowWhen(NOT IsInitialized,'<#THE REMOTE TASK IS NOT INITIALIZED#>'); SUPER.ThrowWhen(HasRemoteException, ErrorDetails); SUPER.DoneWhen(StartSignature = DoneSignature); // This will set the IsInitialized to TRUE when the remote system acknowledges the StartSignature diff --git a/src/core/ctrl/src/AxoTask/AxoTaskLight.st b/src/core/ctrl/src/AxoTask/AxoTaskLight.st index e175e7627..0cc75ce90 100644 --- a/src/core/ctrl/src/AxoTask/AxoTaskLight.st +++ b/src/core/ctrl/src/AxoTask/AxoTaskLight.st @@ -245,7 +245,7 @@ NAMESPACE AXOpen.Core IF _context = NULL THEN Status := eAxoTaskState#Error; - ErrorDetails := 'NULL CONTEXT'; + ErrorDetails := '<#NULL CONTEXT#>'; RETURN; END_IF; @@ -260,15 +260,15 @@ NAMESPACE AXOpen.Core IF (THIS.IsExecuteCalledInThisPlcCycle() OR THIS.WasExecuteCalledInPreviousPlcCycle()) THEN IF(NOT IsDisabled) THEN Status := eAxoTaskState#Kicking; - _context.GetLogger().Log('Task invoked', eLogLevel#Verbose, THIS); + _context.GetLogger().Log('<#Task invoked#>', eLogLevel#Verbose, THIS); ELSE - _context.GetLogger().Log('Attempt to invoke disabled task', eLogLevel#Information, THIS); + _context.GetLogger().Log('<#Attempt to invoke disabled task#>', eLogLevel#Information, THIS); END_IF; ELSE IF(NOT _suspendCyclicExecuteIsNotCalledCheck) THEN _cyclicExecuteIsNotCalled := TRUE; Status := eAxoTaskState#Error; - ErrorDetails := 'CyclicExecuteIsNotCalled'; + ErrorDetails := '<#CyclicExecuteIsNotCalled#>'; END_IF; END_IF; END_IF; @@ -288,7 +288,7 @@ NAMESPACE AXOpen.Core IF(_context = NULL) THEN _context := THIS.GetContext(); END_IF; - _context.GetLogger().Log('Task restored', eLogLevel#Verbose, THIS); + _context.GetLogger().Log('<#Task restored#>', eLogLevel#Verbose, THIS); _restoreCycleCount := _context.OpenCycleCount(); END_IF; Status := eAxoTaskState#Ready; @@ -314,7 +314,7 @@ NAMESPACE AXOpen.Core IF(_context = NULL) THEN _context := THIS.GetContext(); END_IF; - _context.GetLogger().Log('Task done.', eLogLevel#Verbose, THIS); + _context.GetLogger().Log('<#Task done.#>', eLogLevel#Verbose, THIS); Status := eAxoTaskState#Done; THIS.OnDone(); _doneCycleCount := _context.OpenCycleCount(); @@ -346,7 +346,7 @@ NAMESPACE AXOpen.Core IF _openCycleCountExecute = _openCycleCount && _openCycleCount > ULINT#0 THEN _multipleExecuteIsCalled := TRUE; Status := eAxoTaskState#Error; - ErrorDetails := 'MultipleExecuteIsCalled'; + ErrorDetails := '<#MultipleExecuteIsCalled#>'; END_IF; END_IF; @@ -385,7 +385,7 @@ NAMESPACE AXOpen.Core // Don't touch this, it is used for remote execs. StartSignature := _openCycleCountExecute;//_context.OpenCycleCount(); - _context.GetLogger().Log('Task started.', eLogLevel#Verbose, THIS); + _context.GetLogger().Log('<#Task started.#>', eLogLevel#Verbose, THIS); THIS.OnStart(); _isFirstExecutionCycle := TRUE; _startCycleCount := _context.OpenCycleCount(); @@ -430,7 +430,7 @@ NAMESPACE AXOpen.Core _context := THIS.GetContext(); END_IF; Status := eAxoTaskState#Error; - _context.GetLogger().Log('Task failed', eLogLevel#Error, THIS); + _context.GetLogger().Log('<#Task failed#>', eLogLevel#Error, THIS); THIS.OnError(); THIS.WhileError(); _errorCycleCount := _context.OpenCycleCount(); diff --git a/src/core/ctrl/test/AxoTask/AxoTaskTests.st b/src/core/ctrl/test/AxoTask/AxoTaskTests.st index ea8a63ca1..5601296ff 100644 --- a/src/core/ctrl/test/AxoTask/AxoTaskTests.st +++ b/src/core/ctrl/test/AxoTask/AxoTaskTests.st @@ -1358,7 +1358,7 @@ NAMESPACE AXOpen.Core.AxoTask_Tests _context.Close(); //Assert - Assert.Equal(TRUE, THIS.AreEqual('CyclicExecuteIsNotCalled', myTask.ErrorDetails)); + Assert.Equal(TRUE, THIS.AreEqual('<#CyclicExecuteIsNotCalled#>', myTask.ErrorDetails)); END_METHOD {Test} @@ -1417,7 +1417,7 @@ NAMESPACE AXOpen.Core.AxoTask_Tests _context.Close(); //Assert - Assert.Equal(TRUE, THIS.AreEqual('MultipleExecuteIsCalled', myTask.ErrorDetails)); + Assert.Equal(TRUE, THIS.AreEqual('<#MultipleExecuteIsCalled#>', myTask.ErrorDetails)); END_METHOD {Test} diff --git a/src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor b/src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor index 085b2fe2b..cdc2654f4 100644 --- a/src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor +++ b/src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor @@ -17,8 +17,8 @@ @if (_alarmCount > 0) { - }
@@ -64,7 +64,7 @@ {
- + @foreach (var detailsTab in DetailsTabs) { diff --git a/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor index be9a27daa..1fd693a93 100644 --- a/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor +++ b/src/core/src/AXOpen.Core.Blazor/AxoCoordination/AxoSequencer/AxoSequencerView.razor @@ -17,28 +17,28 @@
- - +
@if (_isDetailsExpanded) @@ -58,28 +58,28 @@
- Symbol + @Localizer["Symbol"] @DisplayOrDash(Component.Symbol)
- Human Readable + @Localizer["HumanReadable"] @DisplayOrDash(Component.HumanReadable)
- Alarm ID + @Localizer["AlarmId"] @DisplayOrDash(Component.Identity.LastValue.ToString())
- Suggestion + @Localizer["Suggestion"] @DisplayOrDash(Component.GetHelpText())
- RESTORE - + @Localizer["Restore"] +
@@ -91,20 +91,20 @@ @code { private bool _isDetailsExpanded { get; set; } = false; - private static string ConvertToInternalSeverityName(eAxoMessageCategory category) + private string ConvertToInternalSeverityName(eAxoMessageCategory category) { switch (category) { case eAxoMessageCategory.Info: - return "Info"; + return Localizer["SeverityInfo"]; case eAxoMessageCategory.Warning: - return "Warning"; + return Localizer["SeverityWarning"]; case eAxoMessageCategory.Error: - return "Minor Fault"; + return Localizer["SeverityMinorFault"]; case eAxoMessageCategory.ProgrammingError: - return "Major Fault"; + return Localizer["SeverityMajorFault"]; case eAxoMessageCategory.Critical: - return "Critical"; + return Localizer["SeverityCritical"]; } return string.Empty; } @@ -163,7 +163,7 @@ return string.Empty; } - private string StateLabel => Component.IsActive ? (Component.IsAcknowledged ? "Active · Acknowledged" : "Active · Unacknowledged") : "Cleared"; + private string StateLabel => Component.IsActive ? (Component.IsAcknowledged ? Localizer["ActiveAcknowledged"] : Localizer["ActiveUnacknowledged"]) : Localizer["Cleared"]; private bool CanAcknowledge => Component.IsActive || !Component.IsAcknowledged; diff --git a/src/core/src/AXOpen.Core.Blazor/AxoTask/AxoTaskView.razor b/src/core/src/AXOpen.Core.Blazor/AxoTask/AxoTaskView.razor index 2d2603d8b..024553fe8 100644 --- a/src/core/src/AXOpen.Core.Blazor/AxoTask/AxoTaskView.razor +++ b/src/core/src/AXOpen.Core.Blazor/AxoTask/AxoTaskView.razor @@ -41,11 +41,11 @@ - Restore + @Localizer["RestoreButton"] } diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de.resx new file mode 100644 index 000000000..0938b76df --- /dev/null +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.de.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Läuft + + + Leerlauf + + + Fehler + + + Zeitüberschreitung + + + SCHRITTMODUS + + + SCHRITTMODUS AKTIV - GESTEUERT VON MASTERSEQUENZ + + + SCHRITTMODUS GESTEUERT VON MASTERSEQUENZ + + + Schrittmodus aktivieren + + + Schrittmodus beenden + + + + Ausrüstung + + + Ausgelöst + + + Quittiert + + + Dauer + + + Symbol + + + Lesbar + + + Alarm-ID + + + Vorschlag + + + WIEDERHERSTELLEN + + + Wiederherstellen + + + Quittieren + + + DETAILS AUSBLENDEN + + + DETAILS ANZEIGEN + + + Details anzeigen + + + Aufgabe zurücksetzen + + + + Info + + + Warnung + + + Kleiner Fehler + + + Großer Fehler + + + Kritisch + + + + Aktiv · Quittiert + + + Aktiv · Nicht quittiert + + + Behoben + + + + Aktiver Alarm + + + Aktive Alarme + + + Keine Alarme + + + aktiv + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es.resx new file mode 100644 index 000000000..5e52a9c75 --- /dev/null +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.es.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + En ejecución + + + Inactivo + + + Error + + + Tiempo agotado + + + MODO PASO + + + MODO PASO ACTIVO - CONTROLADO POR SECUENCIA MAESTRA + + + MODO PASO CONTROLADO POR SECUENCIA MAESTRA + + + Entrar en modo paso + + + Salir del modo paso + + + + Equipo + + + Activada + + + Reconocida + + + Duración + + + Símbolo + + + Legible + + + ID de alarma + + + Sugerencia + + + RESTAURAR + + + Restaurar + + + Reconocer + + + OCULTAR DETALLES + + + MOSTRAR DETALLES + + + Ver detalles + + + Restablecer tarea + + + + Info + + + Advertencia + + + Fallo menor + + + Fallo mayor + + + Crítico + + + + Activo · Reconocido + + + Activo · No reconocido + + + Despejado + + + + Alarma activa + + + Alarmas activas + + + Sin alarmas + + + activo + + diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.resx index e8ae276d9..0812c76c7 100644 --- a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.resx +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.resx @@ -58,4 +58,117 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Running + + + Idle + + + Error + + + Timeout + + + STEP MODE + + + STEP MODE ACTIVE - CONTROLLED BY MASTER SEQUENCE + + + STEP MODE CONTROLLED BY MASTER SEQUENCE + + + Enter step mode + + + Exit step mode + + + + Equipment + + + Raised + + + Acknowledged + + + Duration + + + Symbol + + + Human Readable + + + Alarm ID + + + Suggestion + + + RESTORE + + + Restore + + + Acknowledge + + + HIDE DETAILS + + + SHOW DETAILS + + + View Details + + + Reset task + + + + Info + + + Warning + + + Minor Fault + + + Major Fault + + + Critical + + + + Active · Acknowledged + + + Active · Unacknowledged + + + Cleared + + + + Active Alarm + + + Active Alarms + + + No Alarms + + + active + \ No newline at end of file diff --git a/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk.resx b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk.resx new file mode 100644 index 000000000..e37e0a33e --- /dev/null +++ b/src/core/src/AXOpen.Core.Blazor/Properties/AxOpenCoreResources.sk.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Beží + + + Nečinný + + + Chyba + + + Vypršal čas + + + KROKOVÝ MÓD + + + KROKOVÝ MÓD AKTÍVNY - RIADENÝ HLAVNOU SEKVENCIOU + + + KROKOVÝ MÓD RIADENÝ HLAVNOU SEKVENCIOU + + + Zapnúť krokový mód + + + Vypnúť krokový mód + + + + Zariadenie + + + Vyvolaný + + + Potvrdený + + + Trvanie + + + Symbol + + + Čitateľný názov + + + ID alarmu + + + Návrh + + + OBNOVIŤ + + + Obnoviť + + + Potvrdiť + + + SKRYŤ DETAILY + + + ZOBRAZIŤ DETAILY + + + Zobraziť detaily + + + Resetovať úlohu + + + + Info + + + Varovanie + + + Menšia chyba + + + Väčšia chyba + + + Kritický + + + + Aktívny · Potvrdený + + + Aktívny · Nepotvrdený + + + Vymazaný + + + + Aktívny alarm + + + Aktívne alarmy + + + Žiadne alarmy + + + aktívny + + diff --git a/src/core/src/AXOpen.Core.Blazor/Resources/StringResources.es.resx b/src/core/src/AXOpen.Core.Blazor/Resources/StringResources.es.resx index 15dc59c42..792ef17ae 100644 --- a/src/core/src/AXOpen.Core.Blazor/Resources/StringResources.es.resx +++ b/src/core/src/AXOpen.Core.Blazor/Resources/StringResources.es.resx @@ -121,7 +121,7 @@ Cancelar - ¡Cerca! + ¡Cierra! Cerrar todo diff --git a/src/core/src/AXOpen.Core/Resources/PlcStringResources.Designer.cs b/src/core/src/AXOpen.Core/Resources/PlcStringResources.Designer.cs index 104ce76d5..39a3c6b32 100644 --- a/src/core/src/AXOpen.Core/Resources/PlcStringResources.Designer.cs +++ b/src/core/src/AXOpen.Core/Resources/PlcStringResources.Designer.cs @@ -61,47 +61,182 @@ internal PlcStringResources() { } /// - /// Looks up a localized string similar to Command state. + /// Looks up a localized string similar to At step:. /// - public static string Command_state { + public static string At_step_COLON_ { get { - return ResourceManager.GetString("Command_state", resourceCulture); + return ResourceManager.GetString("At_step_COLON_", resourceCulture); } } /// - /// Looks up a localized string similar to Manually Controllable. + /// Looks up a localized string similar to Attempt to invoke disabled task. /// - public static string Is_manually_controllable { + public static string Attempt_to_invoke_disabled_task { get { - return ResourceManager.GetString("Is_manually_controllable", resourceCulture); + return ResourceManager.GetString("Attempt_to_invoke_disabled_task", resourceCulture); } } /// - /// Looks up a localized string similar to Run step. + /// Looks up a localized string similar to Check that steps are unique and properly configured.. /// - public static string Run_step { + public static string Check_that_steps_are_unique_and_properly_configured_DOT_ { get { - return ResourceManager.GetString("Run_step", resourceCulture); + return ResourceManager.GetString("Check_that_steps_are_unique_and_properly_configured_DOT_", resourceCulture); } } /// - /// Looks up a localized string similar to Sequence mode. + /// Looks up a localized string similar to CyclicExecuteIsNotCalled. /// - public static string Sequence_mode { + public static string CyclicExecuteIsNotCalled { get { - return ResourceManager.GetString("Sequence_mode", resourceCulture); + return ResourceManager.GetString("CyclicExecuteIsNotCalled", resourceCulture); } } /// - /// Looks up a localized string similar to Stepping mode. + /// Looks up a localized string similar to Fallen. /// - public static string Stepping_mode { + public static string Fallen { get { - return ResourceManager.GetString("Stepping_mode", resourceCulture); + return ResourceManager.GetString("Fallen", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MultipleExecuteIsCalled. + /// + public static string MultipleExecuteIsCalled { + get { + return ResourceManager.GetString("MultipleExecuteIsCalled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to NULL CONTEXT. + /// + public static string NULL_CONTEXT { + get { + return ResourceManager.GetString("NULL_CONTEXT", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Risen. + /// + public static string Risen { + get { + return ResourceManager.GetString("Risen", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Risen again before acknowledgement. + /// + public static string Risen_again_before_acknowledgement { + get { + return ResourceManager.GetString("Risen_again_before_acknowledgement", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sequence completed :. + /// + public static string Sequence_completed__COLON_ { + get { + return ResourceManager.GetString("Sequence_completed__COLON_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sequence in config state :. + /// + public static string Sequence_in_config_state__COLON_ { + get { + return ResourceManager.GetString("Sequence_in_config_state__COLON_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starts step :. + /// + public static string Starts_step__COLON_ { + get { + return ResourceManager.GetString("Starts_step__COLON_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Step done :. + /// + public static string Step_done__COLON_ { + get { + return ResourceManager.GetString("Step_done__COLON_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Step request to step :. + /// + public static string Step_request_to_step__COLON_ { + get { + return ResourceManager.GetString("Step_request_to_step__COLON_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Task done.. + /// + public static string Task_done_DOT_ { + get { + return ResourceManager.GetString("Task_done_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Task failed. + /// + public static string Task_failed { + get { + return ResourceManager.GetString("Task_failed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Task invoked. + /// + public static string Task_invoked { + get { + return ResourceManager.GetString("Task_invoked", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Task restored. + /// + public static string Task_restored { + get { + return ResourceManager.GetString("Task_restored", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Task started.. + /// + public static string Task_started_DOT_ { + get { + return ResourceManager.GetString("Task_started_DOT_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to THE REMOTE TASK IS NOT INITIALIZED. + /// + public static string THE_REMOTE_TASK_IS_NOT_INITIALIZED { + get { + return ResourceManager.GetString("THE_REMOTE_TASK_IS_NOT_INITIALIZED", resourceCulture); } } } diff --git a/src/core/src/AXOpen.Core/Resources/PlcStringResources.de.resx b/src/core/src/AXOpen.Core/Resources/PlcStringResources.de.resx index 1f3304300..801b17917 100644 --- a/src/core/src/AXOpen.Core/Resources/PlcStringResources.de.resx +++ b/src/core/src/AXOpen.Core/Resources/PlcStringResources.de.resx @@ -132,4 +132,64 @@ Schritt ausführen + + DIE ENTFERNTE AUFGABE IST NICHT INITIALISIERT + + + NULL KONTEXT + + + Aufgerufene Aufgabe + + + Versuch, eine deaktivierte Aufgabe aufzurufen + + + CyclicExecuteIsNotCalled + + + Aufgabe wiederhergestellt + + + Aufgabe erledigt. + + + MultipleExecuteIsCalled + + + Aufgabe gestartet. + + + Aufgabe fehlgeschlagen + + + Sequenz im Konfigurationszustand : + + + Startet Schritt : + + + Überprüfen Sie, ob die Schritte eindeutig und richtig konfiguriert sind. + + + Schritt erledigt: + + + Schritt Anfrage zu Schritt : + + + Sequenz abgeschlossen: + + + Auf Schritt und Tritt: + + + Auferstanden + + + Vor der Anerkennung wieder auferstanden + + + Gefallen + \ No newline at end of file diff --git a/src/core/src/AXOpen.Core/Resources/PlcStringResources.es.resx b/src/core/src/AXOpen.Core/Resources/PlcStringResources.es.resx index 6b078e53b..7aa7c3a27 100644 --- a/src/core/src/AXOpen.Core/Resources/PlcStringResources.es.resx +++ b/src/core/src/AXOpen.Core/Resources/PlcStringResources.es.resx @@ -132,4 +132,64 @@ Correr paso + + LA TAREA REMOTA NO ESTÁ INICIALIZADA + + + CONTEXTO NULO + + + Tarea invocada + + + Intento de invocar tarea desactivada + + + CyclicExecuteIsNotCalled + + + Tarea restaurada + + + Tarea realizada. + + + MultipleExecuteIsCalled + + + Tarea iniciada. + + + Tarea fallida + + + Secuencia en estado config : + + + Inicia el paso : + + + Compruebe que los pasos son únicos y están correctamente configurados. + + + Paso realizado : + + + Petición de paso a paso : + + + Secuencia completada : + + + Al paso: + + + Resucitado + + + Resucitado antes del reconocimiento + + + Caídos + \ No newline at end of file diff --git a/src/core/src/AXOpen.Core/Resources/PlcStringResources.resx b/src/core/src/AXOpen.Core/Resources/PlcStringResources.resx index 16262f9c6..d9e92f84c 100644 --- a/src/core/src/AXOpen.Core/Resources/PlcStringResources.resx +++ b/src/core/src/AXOpen.Core/Resources/PlcStringResources.resx @@ -58,19 +58,84 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Manually Controllable + + THE REMOTE TASK IS NOT INITIALIZED + src\AxoAlert\AxoAlert.st,45 - - Command state + + NULL CONTEXT + src\AxoTask\AxoTaskLight.st,247 - - Stepping mode + + Task invoked + src\AxoTask\AxoTaskLight.st,262 - - Sequence mode + + Attempt to invoke disabled task + src\AxoTask\AxoTaskLight.st,264 - - Run step + + CyclicExecuteIsNotCalled + src\AxoTask\AxoTaskLight.st,270 + + + Task restored + src\AxoTask\AxoTaskLight.st,290 + + + Task done. + src\AxoTask\AxoTaskLight.st,316 + + + MultipleExecuteIsCalled + src\AxoTask\AxoTaskLight.st,348 + + + Task started. + src\AxoTask\AxoTaskLight.st,387 + + + Task failed + src\AxoTask\AxoTaskLight.st,432 + + + Sequence in config state : + src\AxoCoordination\AxoSequencer\AxoSequencer.st,77 + + + Starts step : + src\AxoCoordination\AxoSequencer\AxoSequencer.st,182 + + + Check that steps are unique and properly configured. + src\AxoCoordination\AxoSequencer\AxoSequencer.st,197 + + + Step done : + src\AxoCoordination\AxoSequencer\AxoSequencer.st,233 + + + Step request to step : + src\AxoCoordination\AxoSequencer\AxoSequencer.st,260 + + + Sequence completed : + src\AxoCoordination\AxoSequencer\AxoSequencer.st,292 + + + At step: + src\AxoCoordination\AxoStep\AxoStep.st,173 + + + Risen + src\AxoMessaging\Static\AxoMessenger.st,110 + + + Risen again before acknowledgement + src\AxoMessaging\Static\AxoMessenger.st,121 + + + Fallen + src\AxoMessaging\Static\AxoMessenger.st,200 \ No newline at end of file diff --git a/src/core/src/AXOpen.Core/Resources/PlcStringResources.sk.resx b/src/core/src/AXOpen.Core/Resources/PlcStringResources.sk.resx index 61347bf2c..58c837d61 100644 --- a/src/core/src/AXOpen.Core/Resources/PlcStringResources.sk.resx +++ b/src/core/src/AXOpen.Core/Resources/PlcStringResources.sk.resx @@ -132,4 +132,64 @@ Ručne ovládateľné + + VZDIALENÁ ÚLOHA NIE JE INICIALIZOVANÁ + + + NULL CONTEXT + + + Vyvolaná úloha + + + Pokus o vyvolanie zakázanej úlohy + + + CyclicExecuteIsNotCalled + + + Obnovená úloha + + + Úloha je splnená. + + + MultipleExecuteIsCalled + + + Úloha sa začala. + + + Úloha zlyhala + + + Sekvencia v konfiguračnom stave : + + + Začína krok : + + + Skontrolujte, či sú kroky jedinečné a správne nakonfigurované. + + + Krok hotový : + + + Žiadosť o krok na krok : + + + Sekvencia dokončená : + + + Na krok: + + + Risen + + + Znovu vzkriesený pred potvrdením + + + Fallen + \ No newline at end of file diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs index 164e398b8..42c8916ef 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs @@ -30,6 +30,7 @@ using System.IO; using System.Security.Cryptography; using static AXOpen.Data.DataExchangeViewModel; +using Properties = AXOpen.Data.Blazor.Properties; namespace AXOpen.Data; @@ -229,7 +230,7 @@ private async Task LoadFile(InputFileChangeEventArgs e) } catch (Exception ex) { - _toastService.AddToast(eToastType.Danger, "Error!", ex.Message, 10); + _toastService.AddToast(eToastType.Danger, Properties.AxOpenDataResources.Error, ex.Message, 10); _fileLoadingStatus = eOperationStatus.Failed; } } diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs index 63763c382..b61bf1024 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs @@ -24,6 +24,7 @@ using AXOpen.Base.Data.Query; using static Microsoft.EntityFrameworkCore.DbLoggerCategory; using Operon.Components.Toast; +using Properties = AXOpen.Data.Blazor.Properties; namespace AXOpen.Data { @@ -356,17 +357,17 @@ public async Task CreateNew() { if (string.IsNullOrEmpty(CreateItemId)) { - ToastService?.AddToast(eToastType.Danger, "Cannot create!", "New entry name cannot be empty. Please provide an ID", 10); + ToastService?.AddToast(eToastType.Danger, Properties.AxOpenDataResources.Cannot_create, Properties.AxOpenDataResources.New_entry_name_cannot_be_empty, 10); return; } await DataExchange.CreateNewAsync(CreateItemId, RefUIData); AxoApplication.Current.Logger.Information($"Created {CreateItemId} in {DataExchange} by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity); - ToastService?.AddToast(eToastType.Success, "Created!", "Item was successfully created!", 10); + ToastService?.AddToast(eToastType.Success, Properties.AxOpenDataResources.Created, Properties.AxOpenDataResources.Item_was_successfully_created, 10); } catch (Exception e) { - ToastService?.AddToast(eToastType.Danger, "Failed to create new record!", e.Message, 10); + ToastService?.AddToast(eToastType.Danger, Properties.AxOpenDataResources.Failed_to_create_new_record, e.Message, 10); } finally { @@ -383,11 +384,11 @@ public async Task Delete() { await DataExchange.Delete(SelectedRecord._EntityId); AxoApplication.Current.Logger.Information($"Deleted {SelectedRecord._EntityId} from {DataExchange} by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity); - ToastService?.AddToast(eToastType.Success, "Deleted!", "Item was successfully deleted!", 10); + ToastService?.AddToast(eToastType.Success, Properties.AxOpenDataResources.Deleted, Properties.AxOpenDataResources.Item_was_successfully_deleted, 10); } catch (Exception e) { - ToastService?.AddToast(eToastType.Danger, "Failed to delete", e.Message, 10); + ToastService?.AddToast(eToastType.Danger, Properties.AxOpenDataResources.Failed_to_delete, e.Message, 10); } finally { @@ -403,11 +404,11 @@ public async Task Copy() { await DataExchange.CreateCopyCurrentShadowsAsync(CreateItemId, RefUIData); AxoApplication.Current.Logger.Information($"Copied {CreateItemId} into {DataExchange} by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity); - ToastService.AddToast(eToastType.Success, "Copied!", "Item was successfully copied!", 10); + ToastService.AddToast(eToastType.Success, Properties.AxOpenDataResources.Copied, Properties.AxOpenDataResources.Item_was_successfully_copied, 10); } catch (Exception e) { - ToastService?.AddToast(eToastType.Danger, "Failed to copy!", e.Message, 10); + ToastService?.AddToast(eToastType.Danger, Properties.AxOpenDataResources.Failed_to_copy, e.Message, 10); } finally { @@ -421,7 +422,7 @@ public async Task Copy() public async Task Edit() { await DataExchange.UpdateFromShadowsAsync(RefUIData); - ToastService?.AddToast(eToastType.Success, "Edited!", "Item was successfully edited!", 10); + ToastService?.AddToast(eToastType.Success, Properties.AxOpenDataResources.Edited, Properties.AxOpenDataResources.Item_was_successfully_edited, 10); UpdateObservableRecords(BuidDefaultPredicates()); } @@ -429,7 +430,7 @@ public async Task SendToPlc() { await DataExchange.FromRepositoryToControllerAsync(SelectedRecord, RefUIData); AxoApplication.Current.Logger.Information($"Sent to Plc {SelectedRecord._EntityId} in {DataExchange} by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity); - ToastService?.AddToast(eToastType.Success, "Sent to PLC!", "Item was successfully sent to PLC!", 10); + ToastService?.AddToast(eToastType.Success, Properties.AxOpenDataResources.Sent_to_PLC, Properties.AxOpenDataResources.Item_was_successfully_sent_to_PLC, 10); } public async Task LoadFromPlc() @@ -437,12 +438,12 @@ public async Task LoadFromPlc() try { await DataExchange.CreateDataFromControllerAsync(CreateItemId, RefUIData); - ToastService?.AddToast(eToastType.Success, "Loaded from PLC!", "Item was successfully loaded from PLC!", 10); + ToastService?.AddToast(eToastType.Success, Properties.AxOpenDataResources.Loaded_from_PLC, Properties.AxOpenDataResources.Item_was_successfully_loaded_from_PLC, 10); AxoApplication.Current.Logger.Information($"Loaded from Plc {CreateItemId} into {DataExchange} by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity); } catch (Exception e) { - ToastService?.AddToast(eToastType.Danger, "Failed to create new record from the controller", e.Message, 10); + ToastService?.AddToast(eToastType.Danger, Properties.AxOpenDataResources.Failed_to_create_new_record_from_the_controller, e.Message, 10); } finally { @@ -501,13 +502,13 @@ public Task ExportDataAsync(string path) exportStatus = eOperationStatus.Done; - ToastService?.AddToast(eToastType.Success, "Exported!", "Data was successfully exported!", 10); + ToastService?.AddToast(eToastType.Success, Properties.AxOpenDataResources.Exported, Properties.AxOpenDataResources.Data_was_successfully_exported, 10); AxoApplication.Current.Logger.Information($"Data form '{DataExchange}' where exported to location '{path}' by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity); } catch (Exception e) { - ToastService?.AddToast(eToastType.Danger, "Error!", e.Message, 10); + ToastService?.AddToast(eToastType.Danger, Properties.AxOpenDataResources.Error, e.Message, 10); exportStatus = eOperationStatus.Failed; } }); @@ -522,14 +523,14 @@ public Task ImportDataAsync(string path) DataExchange.ImportData(path, AuthenticationProvider.GetAuthenticationStateAsync().Result, exportFileType: ExportSet.ExportFileType, separator: ExportSet.Separator); this.UpdateObservableRecords(); - ToastService?.AddToast(eToastType.Success, "Imported!", "Data were successfully imported!", 10); + ToastService?.AddToast(eToastType.Success, Properties.AxOpenDataResources.Imported, Properties.AxOpenDataResources.Data_were_successfully_imported, 10); AxoApplication.Current.Logger.Information($"Data imported into '{DataExchange}' from location '{path}' by user action.", AuthenticationProvider.GetAuthenticationStateAsync().Result.User.Identity); importStatus = eOperationStatus.Done; } catch (Exception e) { - ToastService?.AddToast(eToastType.Danger, "Error!", e.Message, 10); + ToastService?.AddToast(eToastType.Danger, Properties.AxOpenDataResources.Error, e.Message, 10); } }); } diff --git a/src/data/src/AXOpen.Data.Blazor/DataPersistentExchange/AxoDataPersistentExchangeView.razor b/src/data/src/AXOpen.Data.Blazor/DataPersistentExchange/AxoDataPersistentExchangeView.razor index f3730d415..e6abbd6b0 100644 --- a/src/data/src/AXOpen.Data.Blazor/DataPersistentExchange/AxoDataPersistentExchangeView.razor +++ b/src/data/src/AXOpen.Data.Blazor/DataPersistentExchange/AxoDataPersistentExchangeView.razor @@ -110,7 +110,7 @@ else @onclick='async () => { await Vm.DataExchange.WritePersistentGroupFromRepository(record._EntityId); await Vm.FillObservableRecordsAsync(); - _toastService?.AddToast(eToastType.Success, $"Persistent Data", $"Persistent group {record._EntityId} was successfully loaded to PLC!", 10); + _toastService?.AddToast(eToastType.Success, Localizer["Persistent_Data"], string.Format(Localizer["Persistent_group_loaded_to_PLC"], record._EntityId), 10); }' type="button" class="btn btn-primary px-3 py-0"> @@ -123,7 +123,7 @@ else