Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"AXSharp.ixc": {
"version": "0.46.0-alpha.363",
"version": "0.46.0-alpha.366",
"commands": [
"ixc"
],
Expand All @@ -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"
],
Expand Down Expand Up @@ -55,3 +55,4 @@
}



2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -435,3 +435,5 @@ temp/

#JSONREPOS
**/JSONREPOS/

.cursor
11 changes: 6 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<!-- Framework-Agnostic Packages -->
<ItemGroup>
<!-- AX# Libraries -->
<PackageVersion Include="AXSharp.Abstractions" Version="0.46.0-alpha.363" />
<PackageVersion Include="AXSharp.Connector" Version="0.46.0-alpha.363" />
<PackageVersion Include="AXSharp.Connector.S71500.WebAPI" Version="0.46.0-alpha.363" />
<PackageVersion Include="AXSharp.Presentation.Blazor" Version="0.46.0-alpha.363" />
<PackageVersion Include="AXSharp.Presentation.Blazor.Controls" Version="0.46.0-alpha.363" />
<PackageVersion Include="AXSharp.Abstractions" Version="0.46.0-alpha.366" />
<PackageVersion Include="AXSharp.Connector" Version="0.46.0-alpha.366" />
<PackageVersion Include="AXSharp.Connector.S71500.WebAPI" Version="0.46.0-alpha.366" />
<PackageVersion Include="AXSharp.Presentation.Blazor" Version="0.46.0-alpha.366" />
<PackageVersion Include="AXSharp.Presentation.Blazor.Controls" Version="0.46.0-alpha.366" />
<PackageVersion Include="Inxton.Operon" Version="0.3.0-alpha.100" />
<!-- Data & Serialization -->
<PackageVersion Include="ClosedXML" Version="0.105.0" />
Expand Down Expand Up @@ -90,3 +90,4 @@
</Project>



12 changes: 12 additions & 0 deletions scripts/run-ixr-all-ctrl.ps1
Original file line number Diff line number Diff line change
@@ -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 ""
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion src/Security/src/AXOpen.Security.Blazor/Pages/Manage.razor
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand All @@ -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;
}
}
Expand All @@ -248,7 +248,7 @@
List<User> 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;
}

Expand Down Expand Up @@ -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();
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -285,4 +285,19 @@
<data name="Group Management" xml:space="preserve">
<value>Gruppenmanagement</value>
</data>
<data name="Identified!" xml:space="preserve">
<value>Identifiziert!</value>
</data>
<data name="The external token identified" xml:space="preserve">
<value>Das externe Token wurde identifiziert.</value>
</data>
<data name="Failed to set email." xml:space="preserve">
<value>E-Mail konnte nicht eingerichtet werden.</value>
</data>
<data name="Failed to set phone number." xml:space="preserve">
<value>Die Telefonnummer konnte nicht festgelegt werden.</value>
</data>
<data name="Failed to set externalId, because it is being used by another user." xml:space="preserve">
<value>Die Einstellung von „externalId“ ist fehlgeschlagen, da diese ID bereits von einem anderen Benutzer verwendet wird.</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -285,4 +285,19 @@
<data name="Group Management" xml:space="preserve">
<value>Los Grupos</value>
</data>
<data name="Identified!" xml:space="preserve">
<value>¡Identificado!</value>
</data>
<data name="The external token identified" xml:space="preserve">
<value>El token externo identificado</value>
</data>
<data name="Failed to set email." xml:space="preserve">
<value>No se ha podido configurar el correo electrónico.</value>
</data>
<data name="Failed to set phone number." xml:space="preserve">
<value>No se ha podido configurar el número de teléfono.</value>
</data>
<data name="Failed to set externalId, because it is being used by another user." xml:space="preserve">
<value>No se ha podido establecer externalId, ya que lo está utilizando otro usuario.</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,19 @@
<data name="Group Management" xml:space="preserve">
<value>Group Management</value>
</data>
<data name="Identified!" xml:space="preserve">
<value>Identified!</value>
</data>
<data name="The external token identified" xml:space="preserve">
<value>The external token identified</value>
</data>
<data name="Failed to set email." xml:space="preserve">
<value>Failed to set email.</value>
</data>
<data name="Failed to set phone number." xml:space="preserve">
<value>Failed to set phone number.</value>
</data>
<data name="Failed to set externalId, because it is being used by another user." xml:space="preserve">
<value>Failed to set externalId, because it is being used by another user.</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,19 @@
<data name="Group Management" xml:space="preserve">
<value>Skupiny</value>
</data>
<data name="Identified!" xml:space="preserve">
<value>Identifikované!</value>
</data>
<data name="The external token identified" xml:space="preserve">
<value>Identifikovaný externý token</value>
</data>
<data name="Failed to set email." xml:space="preserve">
<value>Nastavenie e-mailu sa nepodarilo.</value>
</data>
<data name="Failed to set phone number." xml:space="preserve">
<value>Nepodarilo sa nastaviť telefónne číslo.</value>
</data>
<data name="Failed to set externalId, because it is being used by another user." xml:space="preserve">
<value>Nepodarilo sa nastaviť externalId, pretože ho používa iný používateľ.</value>
</data>
</root>
20 changes: 10 additions & 10 deletions src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading
Loading