-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #344 from ix-ax/dev
Experimental release for TIA2AX testing
- Loading branch information
Showing
3,080 changed files
with
545,531 additions
and
88,541 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| ] | ||
| }, | ||
| "docfx": { | ||
| "version": "2.63.0", | ||
| "version": "2.77.0", | ||
| "commands": [ | ||
| "docfx" | ||
| ] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| @PTKu @TomKovac |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,117 @@ | ||
| mode: ContinuousDeployment | ||
| next-version: 0.13.4 | ||
| assembly-versioning-scheme: MajorMinorPatch | ||
| assembly-file-versioning-scheme: MajorMinorPatch | ||
| next-version: 0.19.3 | ||
| tag-prefix: '[vV]?' | ||
| version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).* | ||
| major-version-bump-message: \+semver:\s?(breaking|major) | ||
| minor-version-bump-message: \+semver:\s?(feature|minor) | ||
| patch-version-bump-message: \+semver:\s?(fix|patch) | ||
| no-bump-message: \+semver:\s?(none|skip) | ||
| tag-pre-release-weight: 60000 | ||
| commit-date-format: yyyy-MM-dd | ||
| merge-message-formats: {} | ||
| update-build-number: true | ||
| semantic-version-format: Strict | ||
| strategies: | ||
| - Fallback | ||
| - ConfiguredNextVersion | ||
| - MergeMessage | ||
| - TaggedCommit | ||
| - TrackReleaseBranches | ||
| - VersionInBranchName | ||
| branches: | ||
| main: | ||
| regex: ^master$|^main$ | ||
| mode: ContinuousDelivery | ||
| tag: '' | ||
| label: '' | ||
| increment: Patch | ||
| prevent-increment-of-merged-branch-version: true | ||
| prevent-increment: | ||
| of-merged-branch: true | ||
| track-merge-target: false | ||
| source-branches: [ 'develop', 'release' ] | ||
| track-merge-message: true | ||
| regex: ^master$|^main$ | ||
| source-branches: [] | ||
| is-source-branch-for: [] | ||
| tracks-release-branches: false | ||
| is-release-branch: false | ||
| is-mainline: true | ||
| is-main-branch: true | ||
| pre-release-weight: 55000 | ||
| develop: | ||
| regex: ^dev(elop)?(ment)?$ | ||
| mode: ContinuousDeployment | ||
| tag: alpha | ||
| increment: Minor | ||
| prevent-increment-of-merged-branch-version: false | ||
| track-merge-target: true | ||
| source-branches: [] | ||
| tracks-release-branches: true | ||
| is-release-branch: false | ||
| is-mainline: false | ||
| pre-release-weight: 0 | ||
| release: | ||
| regex: ^releases?[/-] | ||
| mode: ContinuousDeployment | ||
| tag: preview | ||
| increment: None | ||
| prevent-increment-of-merged-branch-version: true | ||
| mode: ManualDeployment | ||
| label: beta | ||
| increment: Patch | ||
| prevent-increment: | ||
| of-merged-branch: true | ||
| when-branch-merged: false | ||
| when-current-commit-tagged: false | ||
| track-merge-target: false | ||
| source-branches: [ 'develop', 'main', 'support', 'release' ] | ||
| track-merge-message: true | ||
| regex: ^releases?[/-](?<BranchName>.+) | ||
| source-branches: | ||
| - main | ||
| is-source-branch-for: [] | ||
| tracks-release-branches: false | ||
| is-release-branch: true | ||
| is-mainline: false | ||
| pre-release-weight: 30000 | ||
| support: | ||
| regex: ^support[/-] | ||
| is-main-branch: false | ||
| pre-release-weight: 30000 | ||
| feature: | ||
| mode: ManualDeployment | ||
| label: '{BranchName}' | ||
| increment: Inherit | ||
| prevent-increment: | ||
| when-current-commit-tagged: false | ||
| track-merge-message: true | ||
| regex: ^features?[/-](?<BranchName>.+) | ||
| source-branches: | ||
| - main | ||
| - release | ||
| is-source-branch-for: [] | ||
| is-main-branch: false | ||
| pre-release-weight: 30000 | ||
| pull-request: | ||
| mode: ContinuousDelivery | ||
| tag: '' | ||
| increment: Patch | ||
| prevent-increment-of-merged-branch-version: true | ||
| track-merge-target: false | ||
| source-branches: [ 'main' ] | ||
| tracks-release-branches: false | ||
| is-release-branch: false | ||
| is-mainline: true | ||
| pre-release-weight: 55000 | ||
| label: PullRequest | ||
| increment: Inherit | ||
| prevent-increment: | ||
| of-merged-branch: true | ||
| when-current-commit-tagged: false | ||
| label-number-pattern: '[/-](?<number>\d+)' | ||
| track-merge-message: true | ||
| regex: ^(pull|pull\-requests|pr)[/-] | ||
| source-branches: | ||
| - main | ||
| - release | ||
| - feature | ||
| is-source-branch-for: [] | ||
| pre-release-weight: 30000 | ||
| unknown: | ||
| mode: ManualDeployment | ||
| label: '{BranchName}' | ||
| increment: Inherit | ||
| prevent-increment: | ||
| when-current-commit-tagged: false | ||
| track-merge-message: false | ||
| regex: (?<BranchName>.+) | ||
| source-branches: | ||
| - main | ||
| - release | ||
| - feature | ||
| - pull-request | ||
| is-source-branch-for: [] | ||
| is-main-branch: false | ||
| ignore: | ||
| sha: [] | ||
| merge-message-formats: {} | ||
| mode: ContinuousDelivery | ||
| label: '{BranchName}' | ||
| increment: Inherit | ||
| prevent-increment: | ||
| of-merged-branch: false | ||
| when-branch-merged: false | ||
| when-current-commit-tagged: true | ||
| track-merge-target: false | ||
| track-merge-message: true | ||
| commit-message-incrementing: Enabled | ||
| regex: '' | ||
| source-branches: [] | ||
| is-source-branch-for: [] | ||
| tracks-release-branches: false | ||
| is-release-branch: false | ||
| is-main-branch: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,22 @@ | ||
|  | ||
|  | ||
|
|
||
| [](https://github.com/ix-ax/ix/actions/workflows/dev.yml) | ||
| [](https://github.com/ix-ax/ix/actions/workflows/release.yml) | ||
| [](https://github.com/ix-ax/ix/actions/workflows/master.yml) | ||
| [](https://github.com/ix-ax/axsharp/actions/workflows/dev.yml) | ||
| [](https://github.com/ix-ax/axsharp/actions/workflows/release.yml) | ||
| [](https://github.com/ix-ax/axsharp/actions/workflows/master.yml) | ||
|  | ||
| [](https://github.com/ix-ax/ix/blob/master/LICENSE) | ||
| [](https://github.com/ix-ax/axsharp/blob/dev/LICENSE) | ||
|
|
||
| > **NOTE** | ||
| > **We have just gone through project-wide refactoring changing the name from **IX** to **AX#** (AXSharp). Some links and documentation may still be using the IX and some links are still broken at this point. We are working hard on fixing those issues. Should any of these block you please feel free to reach out to the team.** | ||
| # IX | ||
|
|
||
| The **IX** is a series of tools that extend SIMATIC AX (Automation Xpansion) with a flexible and powerful connection with .NET ecosystem. IX includes a compiler (`ixc`) that translates PLC data structures into C# (PLC .NET Twin), which makes the PLC data available in a structured way for any .NET application. Furthermore, presentation libraries provide additional features for the automated rendering of PLC data in the UI/HMI. | ||
| # AX# | ||
|
|
||
| The **AX#** is a series of tools that extend SIMATIC AX (Automation Xpansion) with a flexible and powerful connection with .NET ecosystem. AX# includes a compiler (`ixc`) that translates PLC data structures into C# (PLC .NET Twin), which makes the PLC data available in a structured way for any .NET application. Furthermore, presentation libraries provide additional features for the automated rendering of PLC data in the UI/HMI. | ||
|
|
||
| ## State of the project | ||
|
|
||
| This project is under development; however, we are [releasing versions](https://github.com/ix-ax/ix/releases) that you can play with before the release of the full version. This project follows [semantic versioning](https://semver.org/). | ||
| This project is under development; however, we are [releasing versions](https://github.com/ix-ax/axsharp/releases) that you can play with before the release of the full version. This project follows [semantic versioning](https://semver.org/). | ||
|
|
||
| All versions released with a major version number `0` (e.g. 0.10.0) can have breaking changes to the previous version at any moment. Stable versions will be released with a major version number greater than `0` (e.g. 1.2.1). | ||
|
|
||
|
|
@@ -25,26 +28,27 @@ We plan to have production-ready libraries and tools in early spring 2024, that | |
| - application templates for quick development and deployment. | ||
|
|
||
|
|
||
| **Documentation** is a work in progress should you find missing, unclear, or misleading content please feel free to [add an issue](https://github.com/ix-ax/ix/issues/new/choose) or to create a pull request with the fix you find appropriate. | ||
| **Documentation** is a work in progress should you find missing, unclear, or misleading content please feel free to [add an issue](https://github.com/ix-ax/axsharp/issues/new/choose) or to create a pull request with the fix you find appropriate. | ||
|
|
||
| There are some **known issues** that we are looking into in the development process. The list of known issues is [here](https://github.com/ix-ax/ix/issues?q=is%3Aissue+is%3Aopen+label%3Aknown-issue). | ||
| There are some **known issues** that we are looking into in the development process. The list of known issues is [here](https://github.com/ix-ax/axsharp/issues?q=is%3Aissue+is%3Aopen+label%3Aknown-issue). | ||
|
|
||
|
|
||
|
|
||
| **IX** is the underlying technology for the [ix.framework](https://github.com/ix-ax/ix.framework) that will be rendered public in this organization and will provide a series of libraries and components for building automation projects. | ||
| **AX#** is the underlying technology for the [AXOpen](https://github.com/ix-ax/AXOpen) that will be rendered public in this organization and will provide a series of libraries and components for building automation projects. | ||
|
|
||
| ## Disclaimer | ||
|
|
||
| **It is necessary to have a valid license for SIMATIC AX in order to use IX!** | ||
| **It is necessary to have a valid license for SIMATIC AX in order to use AX#!** | ||
| SIMATIC AX is currently in a limited sales release in selected European countries only. You will need to request access from the AX team which will check if your use case is suitable for the current state of the product. The first step to getting the approval is contacting your local SIEMENS sales representative or writing an email to [[email protected]](mailto:[email protected]?subject=Request%20for%20access%20|%20SIMATIC%20AX%20for%20IX). | ||
|
|
||
| ## How it works | ||
|
|
||
| In simple terms, the IX takes the PLC program and translates the data structured into .NET classes. | ||
| In simple terms, the AX# takes the PLC program and translates the data structured into .NET classes. | ||
|
|
||
| ### Write PLC code | ||
|
|
||
| ~~~iecst | ||
| {S7.extern=ReadWrite} | ||
| {#ix-attr:[Container(Layout.Stack)]} | ||
| {#ix-attr:[Group(Layout.GroupBox)]} | ||
| {#ix-set:AttributeName = "Location"} | ||
|
|
@@ -72,13 +76,13 @@ END_CLASS | |
|
|
||
| ~~~ C# | ||
| using System; | ||
| using Ix.Connector; | ||
| using Ix.Connector.ValueTypes; | ||
| using AXSharp.Connector; | ||
| using AXSharp.Connector.ValueTypes; | ||
| using System.Collections.Generic; | ||
|
|
||
| [Container(Layout.Stack)] | ||
| [Group(Layout.GroupBox)] | ||
| public partial class GeoLocation : Ix.Connector.ITwinObject | ||
| public partial class GeoLocation : AXSharp.Connector.ITwinObject | ||
| { | ||
| public OnlinerReal Latitude { get; } | ||
|
|
||
|
|
@@ -123,7 +127,7 @@ To get started, visit the documentation [here](docfx/index.md#getting-started). | |
|
|
||
| ## Examples | ||
|
|
||
| Examples can be found [here](src/ix.examples) | ||
| Examples can be found [here](src/AXSharp.examples) | ||
|
|
||
|
|
||
| ## Contributing | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| # run build | ||
| dotnet run --project cake/Build.csproj -- $args --do-docs true | ||
| exit $LASTEXITCODE; | ||
| .\build.ps1 | ||
| dotnet docfx .\docfx\docfx.json |
Oops, something went wrong.