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
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

# Instructions for Writing Pull Request Descriptions

A well-written pull request description helps reviewers understand the context and purpose of your changes, making it easier to provide feedback and approve your pull request.

Checklist:

- [ ] Use the GitHub pull request URL. If not provided, ask the user for the correct link.
- [ ] Compare all changes against the target branch.
- [ ] Review commit messages in the pull request for additional context.
- [ ] Summarize and provide an overview of the changes.
- [ ] Highlight key changes and their impact.
- [ ] Mention any specific areas that need review or attention.
- [ ] Identify any potential risks or issues.
- [ ] Provide separate descriptions for controller (PLC) and higher level framework changes if applicable.
- [ ] Include any relevant screenshots or code snippets if they help illustrate the changes.
- [ ] Ensure the description is clear, concise, and free of jargon.
- [ ] Use bullet points or numbered lists for better readability.
- [ ] Mention any dependencies or related pull requests.
- [ ] Specify the testing performed and any additional testing required.
- [ ] Indicate if documentation updates are needed.
- [ ] Note any configuration changes required.
- [ ] Mention if any new tools or libraries were introduced.
- [ ] Identify any possible backward compatibility issues.
- [ ] Avoid including information already present on the GitHub pull request page.
- [ ] Save the description to CHANGELOG.md if applicable.
- [ ] Link to relevant issues and/or other pull requests if applicable.

32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

### Misc improvements ([#755](https://github.com/Inxton/AXOpen/pull/755))

**Note:** UI and dialog refactoring, as well as package version bumps, may affect backward compatibility for customizations or integrations.



- feat: Added Aventics pneumatic island GSDMLs (V2.3 & V2.34) for Siemens PLC integration
- feat: DotnetIxr Cake helper for executing `dotnet ixr` across folders
- feat: Added multi-root workspace file (`ctrl-workspace.code-workspace`) for control projects
- feat: Localization resource files (.resx) for Blazor, Data, Inspectors, IO, and component libraries
- refactor: Improved layouts in `AxoComponentView` and `AxoMessengerView`; updated help text formatting
- refactor: Dialog subsystem—better error handling and initialization
- chore: Bumped AXSharp.* to 0.40.1-alpha.287 and Inxton.Operon to 0.2.0-alpha.87
- misc: Improved logging and message consistency across modules
- fix: Minor stability and quality adjustments

**Impact:**
- Easier onboarding for pneumatic islands
- Faster interface generation via ixr helper
- Cleaner UI and improved operator/developer experience
- Foundation for multilingual deployments
- Larger solution surface mainly from resource and GSDML XML additions

**Risks/Review:**
- Validate GSDML XMLs in engineering tools
- Confirm resource file conventions
- Test DotnetIxr helper in CI
- Check UI for regressions

**Testing:**
- Manual validation implied; further import/build/smoke tests recommended
15 changes: 15 additions & 0 deletions cake/DotNetCmd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,21 @@ public static void DotnetIxc(this BuildContext context, IEnumerable<string> fold
}
}

public static void DotnetIxr(this BuildContext context, IEnumerable<string> folders)
{
foreach (var folder in folders)
{
context.ProcessRunner.Start(Helpers.GetDotNetCommand(), new ProcessSettings()
{
Arguments = "ixr",
WorkingDirectory = folder,
RedirectStandardOutput = false,
RedirectStandardError = false,
Silent = false
}).WaitForExit();
}
}


//this BuildContext context, string folder, string apaxCommand, ref bool summaryResult
public static string DotNetIxc(this BuildContext context, string folder, ref bool summaryResult)
Expand Down
4 changes: 4 additions & 0 deletions cake/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ public override void Run(BuildContext context)
}
});
}

// context.DotnetIxr(context.Libraries.Where(p => p.pack && Directory.Exists(Path.Combine(context.RootDir, p.folder, "ctrl", "src"))).Select(p => Path.Combine(context.RootDir, p.folder, "ctrl")));

var traversalProjectFolder = Path.Combine(context.RootDir, "traversals", "apax");
if (!context.BuildParameters.NoBuild)
Expand All @@ -202,6 +204,8 @@ public override void Run(BuildContext context)
{
context.ApaxBuild(new[] { traversalProjectFolder });
}


}
}

Expand Down
136 changes: 136 additions & 0 deletions ctrl-workspace.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
"folders": [
{
"name": "core",
"path": "src/core/ctrl"
},
{
"name": "abstractions",
"path": "src/abstractions/ctrl"
},
{
"name": "ax.axopen.app",
"path": "src/ax.axopen.app/ctrl"
},
{
"name": "ax.axopen.hwlibrary",
"path": "src/ax.axopen.hwlibrary/ctrl"
},
{
"name": "ax.axopen.min",
"path": "src/ax.axopen.min/ctrl"
},
{
"name": "ax.latest.packages",
"path": "src/ax.latest.packages/ctrl"
},
{
"name": "components.abb.robotics",
"path": "src/components.abb.robotics/ctrl"
},
{
"name": "components.abstractions",
"path": "src/components.abstractions/ctrl"
},
{
"name": "components.balluff.identification",
"path": "src/components.balluff.identification/ctrl"
},
{
"name": "components.cognex.vision",
"path": "src/components.cognex.vision/ctrl"
},
{
"name": "components.desoutter.tightening",
"path": "src/components.desoutter.tightening/ctrl"
},
{
"name": "components.drives",
"path": "src/components.drives/ctrl"
},
{
"name": "components.elements",
"path": "src/components.elements/ctrl"
},
{
"name": "components.festo.drives",
"path": "src/components.festo.drives/ctrl"
},
{
"name": "components.keyence.vision",
"path": "src/components.keyence.vision/ctrl"
},
{
"name": "components.kuka.robotics",
"path": "src/components.kuka.robotics/ctrl"
},
{
"name": "components.mitsubishi.robotics",
"path": "src/components.mitsubishi.robotics/ctrl"
},
{
"name": "components.pneumatics",
"path": "src/components.pneumatics/ctrl"
},
{
"name": "components.rexroth.drives",
"path": "src/components.rexroth.drives/ctrl"
},
{
"name": "components.rexroth.press",
"path": "src/components.rexroth.press/ctrl"
},
{
"name": "components.rexroth.tightening",
"path": "src/components.rexroth.tightening/ctrl"
},
{
"name": "components.robotics",
"path": "src/components.robotics/ctrl"
},
{
"name": "components.siem.identification",
"path": "src/components.siem.identification/ctrl"
},
{
"name": "components.ur.robotics",
"path": "src/components.ur.robotics/ctrl"
},
{
"name": "data",
"path": "src/data/ctrl"
},
{
"name": "inspectors",
"path": "src/inspectors/ctrl"
},
{
"name": "io",
"path": "src/io/ctrl"
},
{
"name": "probers",
"path": "src/probers/ctrl"
},
{
"name": "sdk-ax",
"path": "src/sdk-ax/ctrl"
},
{
"name": "simatic1500",
"path": "src/simatic1500/ctrl"
},
{
"name": "template.axolibrary",
"path": "src/template.axolibrary/ctrl"
},
{
"name": "timers",
"path": "src/timers/ctrl"
},
{
"name": "utils",
"path": "src/utils/ctrl"
}
]
}
12 changes: 6 additions & 6 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<ItemGroup>
<GlobalPackageReference Include="GitVersion.MsBuild" Version="5.10.3" />
<!-- AX# START -->
<PackageVersion Include="AXSharp.Abstractions" Version="0.40.1-alpha.282" />
<PackageVersion Include="AXSharp.Connector" Version="0.40.1-alpha.282" />
<PackageVersion Include="AXSharp.Connector.S71500.WebAPI" Version="0.40.1-alpha.282" />
<PackageVersion Include="AXSharp.Presentation.Blazor" Version="0.40.1-alpha.282" />
<PackageVersion Include="AXSharp.Presentation.Blazor.Controls" Version="0.40.1-alpha.282" />
<PackageVersion Include="Inxton.Operon" Version="0.2.0-alpha.80" />
<PackageVersion Include="AXSharp.Abstractions" Version="0.40.1-alpha.287" />
<PackageVersion Include="AXSharp.Connector" Version="0.40.1-alpha.287" />
<PackageVersion Include="AXSharp.Connector.S71500.WebAPI" Version="0.40.1-alpha.287" />
<PackageVersion Include="AXSharp.Presentation.Blazor" Version="0.40.1-alpha.287" />
<PackageVersion Include="AXSharp.Presentation.Blazor.Controls" Version="0.40.1-alpha.287" />
<PackageVersion Include="Inxton.Operon" Version="0.2.0-alpha.87" />
<!-- AX# END -->
<!-- Other -->
<PackageVersion Include="ClosedXML" Version="0.104.2" />
Expand Down
Loading
Loading