From 063855b51167b8d3a373fb46b5e87a73ed161330 Mon Sep 17 00:00:00 2001 From: "Drosdzoll, Thomas (DI FA CTR EE PO2)" Date: Mon, 28 Apr 2025 17:01:20 +0200 Subject: [PATCH 1/7] Incorporate new actions and workflows --- .github/workflows/build-library.yml | 10 -- .github/workflows/lint-repo.yml | 4 - .../package-development-workflow.yml | 87 +++++++++++++++ .../workflows/package-release-workflow.yml | 105 ++++++++++++++++++ .github/workflows/release-library.yml | 16 --- .markdownlint.yml | 14 --- CODEOWNERS | 2 +- repolinter.json | 21 ---- 8 files changed, 193 insertions(+), 66 deletions(-) delete mode 100644 .github/workflows/build-library.yml delete mode 100644 .github/workflows/lint-repo.yml create mode 100644 .github/workflows/package-development-workflow.yml create mode 100644 .github/workflows/package-release-workflow.yml delete mode 100644 .github/workflows/release-library.yml delete mode 100644 .markdownlint.yml delete mode 100644 repolinter.json diff --git a/.github/workflows/build-library.yml b/.github/workflows/build-library.yml deleted file mode 100644 index 51fa2e2..0000000 --- a/.github/workflows/build-library.yml +++ /dev/null @@ -1,10 +0,0 @@ -on: push - -jobs: - test-apax-lib: - uses: simatic-ax/actions/.github/workflows/apax-build-test.yml@stable - secrets: - APAX_TOKEN: ${{ secrets.APAX_TOKEN }} - SIMATIC_AX_TOKEN: ${{ secrets.DEPLOY_KEY }} - with: - LOGIN_SIMATIC_AX: true \ No newline at end of file diff --git a/.github/workflows/lint-repo.yml b/.github/workflows/lint-repo.yml deleted file mode 100644 index 9863aa7..0000000 --- a/.github/workflows/lint-repo.yml +++ /dev/null @@ -1,4 +0,0 @@ -on: push -jobs: - lint-repo-and-markdown: - uses: simatic-ax/actions/.github/workflows/check-repository.yml@stable diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml new file mode 100644 index 0000000..7abf900 --- /dev/null +++ b/.github/workflows/package-development-workflow.yml @@ -0,0 +1,87 @@ +# This workflow is going to be used during the development phase of the project +# The workflow builds and tests the the sources on the following triggers: +# - once a change is pushed to the main branch or any of its sub-branches +name: Library development workflow + +on: + push: + branches: + - 'main' # runs the workflow, once new changes have been integrated to main + - 'main/**' # runs the workflow, once new changes have been integrated to a sub-branch of main + pull_request: + branches: + - 'main' # run workflow in the scope of pull requests towards main + workflow_call: + secrets: + APAX_TOKEN: + required: true + inputs: + ref: + required: true + type: string + +permissions: + contents: read # required for checkout + packages: read # required for pulling the container + actions: write # required for artifact uploading + +jobs: + build-and-test: + name: Build and Test + runs-on: ubuntu-24.04 + container: + image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.4.2 + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Checkout Code + uses: actions/checkout@v4 + with: + # either check out a provided reference, or use the reference that triggered this workflow, e.g. a push, PR or a release + ref: ${{ inputs.ref != '' && inputs.ref || github.ref }} + + - name: Login to required registries + uses: simatic-ax/actions/apax-login@v3 + with: + apax-token: ${{ secrets.APAX_TOKEN }} + registries: | + https://npm.pkg.github.com/,${{ secrets.GITHUB_TOKEN }} + + - name: Install dependencies + uses: simatic-ax/actions/apax-install@v3 + with: + immutable: true + + - name: Build source code + uses: simatic-ax/actions/apax-build@v3 + with: + apax-build-targets: | + llvm + 1500 + apax-build-args: | + --debug + --log Debug + + - name: Test source code + uses: simatic-ax/actions/apax-test@v3 + with: + coverage: true + loglevel: debug + + - name: Check links + uses: gaurav-nelson/github-action-markdown-link-check@v1 + with: + check-modified-files-only: 'yes' + base-branch: 'main' + + - name: Upload build artifacts + if: ${{ github.event_name == 'workflow_call' || github.event_name == 'release'}} + uses: actions/upload-artifact@v4 + with: + name: build-artifacts + path: | + bin/1500 + bin/llvm + retention-days: 90 + if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/package-release-workflow.yml b/.github/workflows/package-release-workflow.yml new file mode 100644 index 0000000..40f6f31 --- /dev/null +++ b/.github/workflows/package-release-workflow.yml @@ -0,0 +1,105 @@ +# This workflow is triggered when a release is published via the UI +# The workflow is only executed if the release is a tag and the target_commitish is a release branch +name: Release workflow + +# Start the workflow as soon as a release has been published via the UI +on: + release: + types: [published] + +permissions: + contents: write # required for checkout + packages: write # required for pulling the container + actions: write # required for artifact downloading + pull-requests: write # Für PR-Erstellung und Management + +jobs: + call-development: + name: Build the package + uses: ./.github/workflows/package-development-workflow.yml + secrets: + APAX_TOKEN: ${{ secrets.APAX_TOKEN }} + with: + # checks out the branch that has been selected during the release process + ref: ${{ github.event.release.target_commitish }} + + release: + name: Release the package + needs: call-development + runs-on: ubuntu-24.04 + container: + image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.4.2 + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Checkout Code + uses: actions/checkout@v4 + with: + ref: ${{ github.event.release.target_commitish }} + fetch-depth: 0 + + - name: Create bin folder + run: mkdir -p bin + + - name: Download build artifacts + uses: actions/download-artifact@v4 + with: + name: build-artifacts + path: bin + + - name: Version package + uses: simatic-ax/actions/apax-version@v3 + with: + version: ${{ github.event.release.tag_name }} + + - name: Package source code + uses: simatic-ax/actions/apax-pack@v3 + with: + key: ${{ secrets.APAX_SIGNKEY }} + + - name: Login to required registries + uses: simatic-ax/actions/apax-login@v3 + with: + apax-token: ${{ secrets.APAX_TOKEN }} + registries: | + https://npm.pkg.github.com/,${{ secrets.GITHUB_TOKEN }} + + - name: Publish apax package + uses: simatic-ax/actions/apax-publish@v3 + with: + registries: | + https://npm.pkg.github.com + + # [Optional]: The following steps are not mandatory and are highly depending on your release workflow + # - name: Update Changelog and Create PR + # env: + # GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }} # Hier das neue PAT + # RELEASE_BODY: ${{ github.event.release.body }} + # RELEASE_TAG: ${{ github.event.release.tag_name }} + # RELEASE_DATE: ${{ github.event.release.published_at }} + # TARGET_BRANCH: ${{ github.event.release.target_commitish }} + # run: | + # chmod +x .github/workflows/update-changelog-pr.sh + # .github/workflows/update-changelog-pr.sh + + - name: Update major version tag + if: ${{ success() }} + run: | + git config --global --add safe.directory "$GITHUB_WORKSPACE" + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + + VERSION=${{ github.event.release.tag_name }} + if echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$'; then + MAJOR_VERSION="v$(echo $VERSION | cut -d. -f1)" + echo "Updating major version tag: $MAJOR_VERSION" + git push origin :refs/tags/$MAJOR_VERSION || true + git tag -f $MAJOR_VERSION + git push origin $MAJOR_VERSION --force + echo "✅ Major version tag updated successfully" + else + echo "❌ Error: Invalid version format: '$VERSION'" + echo "Expected format: X.Y.Z (e.g., 1.2.3)" + exit 1 + fi \ No newline at end of file diff --git a/.github/workflows/release-library.yml b/.github/workflows/release-library.yml deleted file mode 100644 index af6befe..0000000 --- a/.github/workflows/release-library.yml +++ /dev/null @@ -1,16 +0,0 @@ -on: - push: - # Pattern matched against refs/tags - tags: - - '*' - -jobs: - release-apax-lib: - uses: simatic-ax/actions/.github/workflows/apax-publish.yml@stable - secrets: - APAX_TOKEN: ${{ secrets.APAX_TOKEN }} - DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }} - APAX_SIGNKEY: ${{ secrets.APAX_SIGNKEY }} - - with: - VERSION: ${{ github.ref_name }} diff --git a/.markdownlint.yml b/.markdownlint.yml deleted file mode 100644 index 62620c9..0000000 --- a/.markdownlint.yml +++ /dev/null @@ -1,14 +0,0 @@ -# markdownlint YAML configuration ---- - -# Default state for all rules -default: true - -# ignored rules -line-length: false -no-inline-html: false -first-line-h1: false -no-emphasis-as-header: false -MD024: - allow_different_nesting: true - siblings_only: true \ No newline at end of file diff --git a/CODEOWNERS b/CODEOWNERS index 7bdce72..420b82b 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,4 @@ # These owners will be the default owners for everything in the repo. # Unless a later match takes precedence, the listed user will be # requested for review when someone opens a pull request. -* @sjuergen @BeckerStS @kruegerfelix \ No newline at end of file +* @sjuergen @ReinerSchinkoethe @theBadT @BeckerStS \ No newline at end of file diff --git a/repolinter.json b/repolinter.json deleted file mode 100644 index f662361..0000000 --- a/repolinter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/todogroup/repolinter/master/rulesets/schema.json", - "version": 2, - "axioms": { - "linguist": "language", - "licensee": "license", - "packagers": "packager" - }, - "rules": { - "license-file-exists": { - "level": "off", - "rule": { - "type": "file-existence", - "options": { - "globsAny": ["LICENSE*", "COPYING*"], - "nocase": true - } - } - } - } -} \ No newline at end of file From e372c3f57572c6cfd7d7ec626fc3bf420409d2f6 Mon Sep 17 00:00:00 2001 From: "Drosdzoll, Thomas (DI FA CTR EE PO2)" Date: Mon, 28 Apr 2025 17:02:56 +0200 Subject: [PATCH 2/7] remove release post-processing --- .../workflows/package-release-workflow.yml | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/.github/workflows/package-release-workflow.yml b/.github/workflows/package-release-workflow.yml index 40f6f31..d009a34 100644 --- a/.github/workflows/package-release-workflow.yml +++ b/.github/workflows/package-release-workflow.yml @@ -69,37 +69,4 @@ jobs: uses: simatic-ax/actions/apax-publish@v3 with: registries: | - https://npm.pkg.github.com - - # [Optional]: The following steps are not mandatory and are highly depending on your release workflow - # - name: Update Changelog and Create PR - # env: - # GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }} # Hier das neue PAT - # RELEASE_BODY: ${{ github.event.release.body }} - # RELEASE_TAG: ${{ github.event.release.tag_name }} - # RELEASE_DATE: ${{ github.event.release.published_at }} - # TARGET_BRANCH: ${{ github.event.release.target_commitish }} - # run: | - # chmod +x .github/workflows/update-changelog-pr.sh - # .github/workflows/update-changelog-pr.sh - - - name: Update major version tag - if: ${{ success() }} - run: | - git config --global --add safe.directory "$GITHUB_WORKSPACE" - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - VERSION=${{ github.event.release.tag_name }} - if echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$'; then - MAJOR_VERSION="v$(echo $VERSION | cut -d. -f1)" - echo "Updating major version tag: $MAJOR_VERSION" - git push origin :refs/tags/$MAJOR_VERSION || true - git tag -f $MAJOR_VERSION - git push origin $MAJOR_VERSION --force - echo "✅ Major version tag updated successfully" - else - echo "❌ Error: Invalid version format: '$VERSION'" - echo "Expected format: X.Y.Z (e.g., 1.2.3)" - exit 1 - fi \ No newline at end of file + https://npm.pkg.github.com \ No newline at end of file From 1f406b4a02f157ee6c6a6a14dbb35c500598816c Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Wed, 7 May 2025 12:59:22 +0200 Subject: [PATCH 3/7] apax image update in workflow --- .github/workflows/package-release-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-release-workflow.yml b/.github/workflows/package-release-workflow.yml index d009a34..4bb3d87 100644 --- a/.github/workflows/package-release-workflow.yml +++ b/.github/workflows/package-release-workflow.yml @@ -28,7 +28,7 @@ jobs: needs: call-development runs-on: ubuntu-24.04 container: - image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.4.2 + image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.5.0 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} From f42fcea9faab3e97d43cf938dfd341b04ed852f3 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Wed, 7 May 2025 13:00:08 +0200 Subject: [PATCH 4/7] cat2504 integration / bin package shipping --- apax-lock.json | 627 ++++++++++++++++------------- apax.yml | 14 +- src/Bulbs/Bulb.st | 2 +- src/Bulbs/LightStack.st | 8 +- src/Encoder/EncoderA.st | 4 +- src/Encoder/EncoderAB.st | 16 +- src/Pusher/PusherBiDirTimeBased.st | 4 +- src/Pusher/PusherTimeBased.st | 2 +- 8 files changed, 365 insertions(+), 312 deletions(-) diff --git a/apax-lock.json b/apax-lock.json index 7064c90..77812e2 100644 --- a/apax-lock.json +++ b/apax-lock.json @@ -7,45 +7,56 @@ "name": "@simatic-ax/simple-control-modules", "version": "0.0.0-placeholder", "dependencies": { - "@simatic-ax/io": "^7.1.0", - "@ax/system-timer": "^8.0.7" + "@ax/system-timer": "10.0.24", + "@simatic-ax/io": "^9.0.0" }, "devDependencies": { - "@ax/sdk": "^2411.0.0", + "@ax/sdk": "2504.0.0", "@simatic-ax/snippetscollection": "^1.0.0" + }, + "catalogs": { + "@ax/simatic-ax": "^2504.0.0" } }, "packages": { "@ax/sdk": { "name": "@ax/sdk", - "version": "2411.0.0", - "integrity": "sha512-TypSqzdGCIHbv55rrjFF6vTNpFmeHYNaT6B0Re3hiGaZxRi5q7V0AevYmgUp0fKW6/djD8kcRD5n1A4502T9Lg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdk/-/sdk-2411.0.0.tgz", + "version": "2504.0.0", + "integrity": "sha512-N/EKc3cmIEtfuHaz1q7sz4Rg3VA3xnS+hBXvtrT1kz9Aslm0In+v3lehzJoKtjhM5/RwX3yqjuIYtPKOY0nNqQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdk/-/sdk-2504.0.0.tgz", "dependencies": { "@ax/apax-build": "2.0.20", - "@ax/axunitst": "6.0.6", - "@ax/axunitst-ls-contrib": "6.0.6", - "@ax/certificate-management": "1.1.3", + "@ax/axunitst": "8.0.33", + "@ax/axunitst-ls-contrib": "8.0.33", + "@ax/certificate-management": "1.2.0", "@ax/diagnostic-buffer": "1.3.2", - "@ax/hw-s7-1500": "2.0.51", - "@ax/hwc": "2.0.51", - "@ax/hwld": "2.0.20", - "@ax/mod": "1.4.6", - "@ax/mon": "1.4.6", + "@ax/hw-s7-1500": "3.0.0", + "@ax/hwc": "3.0.0", + "@ax/hwld": "3.0.0", + "@ax/mod": "1.7.6", + "@ax/mon": "1.7.6", "@ax/performance-info": "1.1.2", - "@ax/plc-info": "3.0.0", - "@ax/sdb": "1.4.6", - "@ax/simatic-package-tool": "2.0.11", - "@ax/simatic-pragma-stc-plugin": "5.0.8", - "@ax/sld": "3.0.9", - "@ax/st-ls": "8.0.17", - "@ax/st-resources.stc-plugin": "2.0.10", - "@ax/stc": "8.0.17", - "@ax/target-llvm": "8.0.17", - "@ax/target-mc7plus": "8.0.17", - "@ax/trace": "2.8.1" + "@ax/plc-control": "1.2.50", + "@ax/plc-info": "3.1.0", + "@ax/sdb": "1.7.6", + "@ax/simatic-package-tool": "2.0.15", + "@ax/sld": "3.2.4", + "@ax/st-ls": "10.0.85", + "@ax/st-opcua.stc-plugin": "1.0.0", + "@ax/st-resources.stc-plugin": "3.0.23", + "@ax/stc": "10.0.85", + "@ax/target-llvm": "10.0.85", + "@ax/target-mc7plus": "10.0.85", + "@ax/trace": "2.9.0" } }, + "@ax/system-timer": { + "name": "@ax/system-timer", + "version": "10.0.24", + "integrity": "sha512-n2ZW2Mbh+f5IHW7+yWgHGR8ddFtq7Px73rGZg/Iypvl2sfP8QZ4fz++M7rQGW+Jvk2w4NPjY1JqieLrpas27Lw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-timer/-/system-timer-10.0.24.tgz", + "dependencies": {} + }, "@simatic-ax/snippetscollection": { "name": "@simatic-ax/snippetscollection", "version": "1.0.0", @@ -55,21 +66,14 @@ }, "@simatic-ax/io": { "name": "@simatic-ax/io", - "version": "7.1.0", - "integrity": "sha512-Rr0Ot1cn1iS0IMWkBkxuIkskft3scavqGCyqkxZ6Dlk+uD1YP+5Mt3m+g9P9djETivU1ebYPhknADsqrmOH04A==", - "resolved": "https://npm.pkg.github.com/download/@simatic-ax/io/7.1.0/a9c5220f1e36dd009429453dbfb7280c4e18ae14", + "version": "9.0.0", + "integrity": "sha512-qO6tItFQZsLbnixnEshXe0sfKVCTBQWGzOP4eCcJu+icr2294Xjw4VJ9uYG5iqC6Ps3ngkT2f1+0J1ZpzCEZ8Q==", + "resolved": "https://npm.pkg.github.com/download/@simatic-ax/io/9.0.0/613b66780db08eb47360a19034dbe2946c63a921", "dependencies": { - "@ax/system-math": "^8.0.7", - "@ax/system-timer": "^8.0.7" + "@ax/system-math": "^10.0.24", + "@ax/system-timer": "^10.0.24" } }, - "@ax/system-timer": { - "name": "@ax/system-timer", - "version": "8.0.7", - "integrity": "sha512-V8iqkWqFFWur7A/yWEWyTAIBOpsIvHOXUokFYy36qUgGe8JPQQ5brzo+hPQfxGdtNmnwQwyeeadMe/J/U87KDQ==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-timer/-/system-timer-8.0.7.tgz", - "dependencies": {} - }, "@ax/apax-build": { "name": "@ax/apax-build", "version": "2.0.20", @@ -79,32 +83,35 @@ }, "@ax/axunitst": { "name": "@ax/axunitst", - "version": "6.0.6", - "integrity": "sha512-rXe92J2ty0VovegmUs0VUuIVp1D1PziEzhm0+j8MTTIIDLrulwjv/DOfme05RKN6jxpEeIfuoiIU+CQ0eDPlIA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst/-/axunitst-6.0.6.tgz", + "version": "8.0.33", + "integrity": "sha512-75SMC8Vc+9LtSiSyYckJ06AnbQFtrB/lrgcnnSyM8VPqDtUh1tRFGVsvBNe4YiJ3ZXm1mXKv3ajwGgODCE7fxA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst/-/axunitst-8.0.33.tgz", "dependencies": { - "@ax/axunitst-library": "6.0.6", - "@ax/axunitst-test-director": "6.0.6", - "@ax/axunitst-docs": "6.0.6", - "@ax/build-native": "16.0.3" + "@ax/axunitst-library": "8.0.33", + "@ax/axunitst-test-director": "8.0.33", + "@ax/build-native": "^16.0.3" } }, "@ax/axunitst-ls-contrib": { "name": "@ax/axunitst-ls-contrib", - "version": "6.0.6", - "integrity": "sha512-Z5WWXXhVH5Cq81AQ6b3cihmWkalDkh9GwgptgTcP+oi5Z8CjVSCWWvpZY5QB2pJMDv/w55n4QxpOMLMkiLH12A==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-ls-contrib/-/axunitst-ls-contrib-6.0.6.tgz", + "version": "8.0.33", + "integrity": "sha512-FDAzrhGYq09PogiFOTq3X1Zg0SSUiNueyEREsuQtME0m/7h86jQvpOke2eMuXQjcP714MGoiEcwrCShn1kAiQg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-ls-contrib/-/axunitst-ls-contrib-8.0.33.tgz", "dependencies": {} }, "@ax/certificate-management": { "name": "@ax/certificate-management", - "version": "1.1.3", - "integrity": "sha512-KDi+BELH05U5nEdezaU8lRVHUVh/7M0fqW5d22wg1ZttH36v0nW6hbXs6ejrJcHtKVCFvGyEadY2kmTt5WWhvA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/certificate-management/-/certificate-management-1.1.3.tgz", - "dependencies": { - "@ax/certificate-management-win-x64": "1.1.3", - "@ax/certificate-management-linux-x64": "1.1.3" - } + "version": "1.2.0", + "integrity": "sha512-k3iKoFTK51yR84+wje0Flaj8o3vid4+KkUOSjCBwcNXXAmIzMmbklPxbEwxF4mG4v0LrpbAjTgq6fHBP+DEKGg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/certificate-management/-/certificate-management-1.2.0.tgz", + "os": [ + "win32", + "linux" + ], + "cpu": [ + "x64" + ], + "dependencies": {} }, "@ax/diagnostic-buffer": { "name": "@ax/diagnostic-buffer", @@ -118,26 +125,26 @@ }, "@ax/hw-s7-1500": { "name": "@ax/hw-s7-1500", - "version": "2.0.51", - "integrity": "sha512-Rjo9VwKHQo6EuUadqV+lO/2xXEPSlx08M3X9Phv2PVCmjp/IRuH3zr9ut9iYZtp2OPC+AzGsHHwBv9WEL3PTJQ==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/hw-s7-1500/-/hw-s7-1500-2.0.51.tgz", + "version": "3.0.0", + "integrity": "sha512-iAyTgiwcjdkb25ofPz0UNtMAtTBXOfoaTq/60gjGAV9LeJQ+Dx4v5JkRNcMSCz1bX2TyKYfhTJSxtqdgJj5Xhg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/hw-s7-1500/-/hw-s7-1500-3.0.0.tgz", "dependencies": {} }, "@ax/hwc": { "name": "@ax/hwc", - "version": "2.0.51", - "integrity": "sha512-ytgiBgktxgAwZdhcWvTDR3lACOzWtOmOBByicM7GPUk0b94zRCBJAFOCabItYkKTCV3Hn09VNP3VDbBD+0D35w==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/hwc/-/hwc-2.0.51.tgz", + "version": "3.0.0", + "integrity": "sha512-kMgipV3XWLt3VpP8G5EDu+Vv3ki2eQLpBwUtt49CBuWXGYs4Rajeb37kML/k4gs/i9TQBRcSBQZHBZti8us1xQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/hwc/-/hwc-3.0.0.tgz", "dependencies": { - "@ax/hwc-win-x64": "2.0.51", - "@ax/hwc-linux-x64": "2.0.51" + "@ax/hwc-win-x64": "3.0.0", + "@ax/hwc-linux-x64": "3.0.0" } }, "@ax/hwld": { "name": "@ax/hwld", - "version": "2.0.20", - "integrity": "sha512-kGYV4xu0tbjWtNlTLb9kGy9lF9aNBMfXeF/SuGWBnPkFEgsgTkSskWfCrvQhwIOI27hRr/vXUXoEgME8NUCsyg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/hwld/-/hwld-2.0.20.tgz", + "version": "3.0.0", + "integrity": "sha512-l84LaJJUY6/ztD9ikFFZNbqv8Z6+KnNaoqWkZqtzHRjS+W/wU9NBkoTu9dR4leQsoSgSWKa9cFtSHyzdfTPuCg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/hwld/-/hwld-3.0.0.tgz", "cpu": [ "x64" ], @@ -145,22 +152,22 @@ }, "@ax/mod": { "name": "@ax/mod", - "version": "1.4.6", - "integrity": "sha512-B/VFMutYC0jXvWcuehmV6tzxsxYeOln6752P0vcAi9oRBf2jZRoXBNc1d/DlFkMooRNUjIiiRw6yqr0U7aTh0g==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod/-/mod-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-+8eeLUJGyImq4YmgavJqPA9yMFt+/ASy5NiuHjK1xOJ84LoHQ6piGr3Yd0UbEHcieh9FirYmAKHwjMn3ftJl+A==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod/-/mod-1.7.6.tgz", "dependencies": { - "@ax/mod-win-x64": "1.4.6", - "@ax/mod-linux-x64": "1.4.6" + "@ax/mod-win-x64": "1.7.6", + "@ax/mod-linux-x64": "1.7.6" } }, "@ax/mon": { "name": "@ax/mon", - "version": "1.4.6", - "integrity": "sha512-GXTniSAyr0mhNSOvzy+BShj0hVKP5mae4XRS+BXxoMZIJe84/vekrZYYUX9YPS31mCcf/6YFNhy5y4X9QldLGA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon/-/mon-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-LCz+0VKgEgdBGLQt7H/VCsEIu+rbFXkFPvfjry3/aBif8r5GE2hOTUmujnSiBgNDujpnoRQtbO7eqKCbwjb41A==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon/-/mon-1.7.6.tgz", "dependencies": { - "@ax/mon-win-x64": "1.4.6", - "@ax/mon-linux-x64": "1.4.6" + "@ax/mon-win-x64": "1.7.6", + "@ax/mon-linux-x64": "1.7.6" } }, "@ax/performance-info": { @@ -173,45 +180,52 @@ "@ax/performance-info-linux-x64": "1.1.2" } }, + "@ax/plc-control": { + "name": "@ax/plc-control", + "version": "1.2.50", + "integrity": "sha512-BH06GYbQc3Y9fkXU25VafYAnWUC89WtcvBxXUQ2Np0lqMip30QRCE3kzET7v7iMNz1zpvVZnnh2Wnngkyu0bqw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/plc-control/-/plc-control-1.2.50.tgz", + "cpu": [ + "x64" + ], + "dependencies": {} + }, "@ax/plc-info": { "name": "@ax/plc-info", - "version": "3.0.0", - "integrity": "sha512-yxu1H3UFE2qp95Hd0UDWcoD23Jika880/4ORtTOQyR48PQWmW3+0Me6nJUqqTv7KGu5MjfVt9R8vNc1KhdA1tg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/plc-info/-/plc-info-3.0.0.tgz", - "dependencies": { - "@ax/plc-info-linux-x64": "3.0.0", - "@ax/plc-info-win-x64": "3.0.0" - } + "version": "3.1.0", + "integrity": "sha512-BvmreWSiWO/h2deSP0hty6kwzZRobQ3bkvKmq3ejsjYtrQtf8QcC+BzHevRxyLxVYCllVmLNuynPvISYSaFQbw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/plc-info/-/plc-info-3.1.0.tgz", + "os": [ + "win32", + "linux" + ], + "cpu": [ + "x64" + ], + "dependencies": {} }, "@ax/sdb": { "name": "@ax/sdb", - "version": "1.4.6", - "integrity": "sha512-JULNDIZOjzU6rVfJG0kRALbVpCTZ7/+cOEWwXNUZCa8+ih2vslQw3LsPTojQqZOCrPpbKpDkd8oyQotTj3dINg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb/-/sdb-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-94lnXmuoPezjPbqq/YT+XXI7rzu0zKeac8smULI00p1H2bsTFsHYwsW/rHc1LAsKSxKAhsUTLme56ahpyck2zw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb/-/sdb-1.7.6.tgz", "dependencies": { - "@ax/sdb-win-x64": "1.4.6", - "@ax/sdb-linux-x64": "1.4.6" + "@ax/sdb-win-x64": "1.7.6", + "@ax/sdb-linux-x64": "1.7.6" } }, "@ax/simatic-package-tool": { "name": "@ax/simatic-package-tool", - "version": "2.0.11", - "integrity": "sha512-PAL+JLAxiwftcMJcx+zwAsAaGNL135bKFemlr1GVIP7e1Tq5nMjb4PYgLW+rQPg/gXZBKSbcj6+PjzXBigdTZw==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/simatic-package-tool/-/simatic-package-tool-2.0.11.tgz", - "dependencies": {} - }, - "@ax/simatic-pragma-stc-plugin": { - "name": "@ax/simatic-pragma-stc-plugin", - "version": "5.0.8", - "integrity": "sha512-fkv8rJkzFKvRRvoT69sn5gx2P74NIiX2uymB997aKmveHQJb+P7E2rIiAD3hA/VqlXYTo13rh0cc7bMVumKEYA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/simatic-pragma-stc-plugin/-/simatic-pragma-stc-plugin-5.0.8.tgz", + "version": "2.0.15", + "integrity": "sha512-oUZiRl32M2IXYxhZaHrHmwOopdhK1Pq92F+uGV0u9AI4MFsw+GKTBCygp2SNqwPckEjPxgy1RwKgHgEI88yyrA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/simatic-package-tool/-/simatic-package-tool-2.0.15.tgz", "dependencies": {} }, "@ax/sld": { "name": "@ax/sld", - "version": "3.0.9", - "integrity": "sha512-9JijTgtQdxjJOwTScqCciAMMMXn59whSKfYWTtndbjKkDhmds+GnuPJz2w0lQdS4IcFm9odxNWWV5I5lfwrZ0Q==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.0.9.tgz", + "version": "3.2.4", + "integrity": "sha512-KRGKm2dCl9alOcOc8Kty7NTHwVsyT19HBDP8k5Sv3L8Dj+S5Y4GinHoFNrlXv2wQVGNXV93ESMYFvjxdsqrOvw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-3.2.4.tgz", "cpu": [ "x64" ], @@ -219,130 +233,104 @@ }, "@ax/st-ls": { "name": "@ax/st-ls", - "version": "8.0.17", - "integrity": "sha512-Q8dB0IiGGdkLJxnb1Q3WCBcd278e3O6dmiQrtKT8Jz4FB3ZER6iRX14P696405dN4x9wPwcOTSY9mhCJhootFw==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-ls/-/st-ls-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-dBi/eQm7ImAIW3vBHrF0vTIq3ZD5IkElMfBQ/ep3WHQzs9uT3K5kYgTX5tuXj6epGGsvs52JCCxJSuyavDL8tg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-ls/-/st-ls-10.0.85.tgz", "dependencies": { - "@ax/st-ls-win-x64": "8.0.17", - "@ax/st-ls-linux-x64": "8.0.17" + "@ax/st-ls-win-x64": "10.0.85", + "@ax/st-ls-linux-x64": "10.0.85" } }, + "@ax/st-opcua.stc-plugin": { + "name": "@ax/st-opcua.stc-plugin", + "version": "1.0.0", + "integrity": "sha512-vrcGgmscXJYea+j8fL4iq+MPNBzvK1ObAzcuZ9NYNFx8IfO94z2Vo8eiNBVAOH8tqycgKIfwzf1KRsqXsimgUg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-opcua.stc-plugin/-/st-opcua.stc-plugin-1.0.0.tgz", + "dependencies": {} + }, "@ax/st-resources.stc-plugin": { "name": "@ax/st-resources.stc-plugin", - "version": "2.0.10", - "integrity": "sha512-+m//RX/nRwbxmPegv4aE2JCdj7Op46mdSTQ4Iif2yJaZKulDOJ2niignYbfphaIpONv+AUz5yrTb8ydgeLEE8w==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-resources.stc-plugin/-/st-resources.stc-plugin-2.0.10.tgz", + "version": "3.0.23", + "integrity": "sha512-lWYWtrrWnd+keI4sw+RcBjEz9oTVgV6wvTAnb2AcE3PHemiirvY52vl6w2OqIFbUMqfhVqpD7KDd83o/HEsAhg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-resources.stc-plugin/-/st-resources.stc-plugin-3.0.23.tgz", "dependencies": {} }, "@ax/stc": { "name": "@ax/stc", - "version": "8.0.17", - "integrity": "sha512-Ym2uWEmfrkhm2Z/ODujUwQOiAwQ2p0fv9hLTJGL+zwYMjAwja71JayMLSOO+cX0gv8VexrxISDa66jouT+XySA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-2zgkFaQmYp9E6Twv/C05zJn37Ym+7UGFUs9aunabp+opWqlYioIToegXLzSlH5gEZ8wRZoIIJQ1YzH+9fxY65g==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-10.0.85.tgz", "dependencies": { - "@ax/stc-win-x64": "8.0.17", - "@ax/stc-linux-x64": "8.0.17" + "@ax/stc-win-x64": "10.0.85", + "@ax/stc-linux-x64": "10.0.85" } }, "@ax/target-llvm": { "name": "@ax/target-llvm", - "version": "8.0.17", - "integrity": "sha512-dNet+Fuubo1abACwt1P0KlKenwwPv3QGEukqmCoxzAbaPmBvaH+zpiZ807I1bCgZ8HSkJYa6n5tg1HYwRIqEuw==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-llvm/-/target-llvm-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-3pWLWB/CaJHeJgRZDxoWi8WIx1Nipk5c4rkyhjrdUhx2nMFU0Ijb7RoeMVvcDHeQJOi37YoHWz4k7ZlrRJRpNw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-llvm/-/target-llvm-10.0.85.tgz", "dependencies": { - "@ax/target-llvm-win-x64": "8.0.17", - "@ax/target-llvm-linux-x64": "8.0.17" + "@ax/target-llvm-win-x64": "10.0.85", + "@ax/target-llvm-linux-x64": "10.0.85" } }, "@ax/target-mc7plus": { "name": "@ax/target-mc7plus", - "version": "8.0.17", - "integrity": "sha512-gbZqAWGJk3mPd/dGjIws8tXOWlDUmBkolcOW1A3Th+vbCKdHwRcZzV0PwCK+jk72CPJ95RBkxhE87sfpfYbGGA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-mc7plus/-/target-mc7plus-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-b2hto1AUqCWCn3n7DS6XmBRc7XGASyLKLcRB8OEvIIgRPUCujpeKFY6Q0qwt3cbtdp9l1ticQF6/4RvmWcWGOg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-mc7plus/-/target-mc7plus-10.0.85.tgz", "dependencies": { - "@ax/target-mc7plus-win-x64": "8.0.17", - "@ax/target-mc7plus-linux-x64": "8.0.17" + "@ax/target-mc7plus-win-x64": "10.0.85", + "@ax/target-mc7plus-linux-x64": "10.0.85" } }, "@ax/trace": { "name": "@ax/trace", - "version": "2.8.1", - "integrity": "sha512-hMBCdnO3VjlZUwhRs8G80kcPPGk0OwkdXUCd7fxIsTYxePIKGE+vTN0myZwBi7d1kJwM5TlpdflXEjJyRlpn5w==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/trace/-/trace-2.8.1.tgz", + "version": "2.9.0", + "integrity": "sha512-ZTNI6hF+U6184d9hcZEMN+A/cTu8JhAG4N5NrlmoEudvgq+iWl++LYZwr5oVNCxZ+0tdOphOKmoQEYJTZGE2/A==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/trace/-/trace-2.9.0.tgz", "dependencies": { - "@ax/trace-win-x64": "2.8.1", - "@ax/trace-linux-x64": "2.8.1" + "@ax/trace-win-x64": "2.9.0", + "@ax/trace-linux-x64": "2.9.0" } }, "@ax/system-math": { "name": "@ax/system-math", - "version": "8.0.7", - "integrity": "sha512-W+jM3gP4BguLMJJprVvEOXkqmsNsqR3BAWmwRM2lsQ6cgMSYheuzXhpBTR3MaIYX4UYM7RXEoQ6sDEszrQ2q9A==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-math/-/system-math-8.0.7.tgz", + "version": "10.0.24", + "integrity": "sha512-bdyToqd9eFG89/Xp/LjaCBC/6yNmy3Z2ynXb/KLsO0avJtgszWtVDW/0yLpB9RgGmzh9vh9feAS7AKgVv1cSPQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-math/-/system-math-10.0.24.tgz", "dependencies": {} }, "@ax/axunitst-library": { "name": "@ax/axunitst-library", - "version": "6.0.6", - "integrity": "sha512-cV8oi/dhgpR+vXWCfqlNHJunJXCsOzz7074WyGLyHJqUn+AOHKZwYbhVP9bHzfQkIaH+IiVdaHLqMLOOzFMW6A==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-library/-/axunitst-library-6.0.6.tgz", + "version": "8.0.33", + "integrity": "sha512-foVDUnQqjUmHiHGhf7Ty0K+HhlXEXM5r0SjnZgJlPFZtgnAI5yvGspGRq+/0zZjMrmEg8xnRDhWZLVtJsoxEIg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-library/-/axunitst-library-8.0.33.tgz", "dependencies": { - "@ax/system-strings": "^8.0.7" + "@ax/system-strings": "^10.0.24" } }, "@ax/axunitst-test-director": { "name": "@ax/axunitst-test-director", - "version": "6.0.6", - "integrity": "sha512-NcW3ynwIcn3tQGV17uc5zC/scvz500SsG8+JHly2bHTRvb5j5f9VVsz/diDnyJ//gLqRAlPgv2YNCAY82W1cQA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-test-director/-/axunitst-test-director-6.0.6.tgz", + "version": "8.0.33", + "integrity": "sha512-rH51qi/29Tz5Q5ZFTwtpKskpdg/M68ml+CEuhUYfzrQhUcEyGeJQSKBNXFcNrXyxcekD5aA1TwxPU2sPN9hMuA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-test-director/-/axunitst-test-director-8.0.33.tgz", "dependencies": { - "@ax/axunitst-test-director-linux-x64": "6.0.6", - "@ax/axunitst-test-director-win-x64": "6.0.6" + "@ax/axunitst-test-director-linux-x64": "8.0.33", + "@ax/axunitst-test-director-win-x64": "8.0.33" } }, - "@ax/axunitst-docs": { - "name": "@ax/axunitst-docs", - "version": "6.0.6", - "integrity": "sha512-rNLMDuckZ2WronFlaPAstbTkebBWYJ1w4B8mwBqepDk93h9RtIhG7oUbCHMG6hGJQYVMwc3rr37FRYBfZboTaA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-docs/-/axunitst-docs-6.0.6.tgz", - "dependencies": {} - }, "@ax/build-native": { "name": "@ax/build-native", - "version": "16.0.3", - "integrity": "sha512-d7I0ICUaIwW/8v030Xw8H6fMMOD2FB9ON7pmq+XV+YXCPorTUJ7rCvq4+710B78QJn2ac+xJgpb1EhI1fiK40w==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/build-native/-/build-native-16.0.3.tgz", + "version": "16.1.17", + "integrity": "sha512-MxzhTXI425dwQgqmhDmVVM885GPT39e6NPRegUZnXHtMUNlxR82F4oifc5rr9JmBwAM2XZ/TDKi/TBHNCaNhpg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/build-native/-/build-native-16.1.17.tgz", "dependencies": { - "@ax/build-native-winx64": "16.0.3", - "@ax/build-native-linux": "16.0.3" + "@ax/build-native-winx64": "16.1.17", + "@ax/build-native-linux": "16.1.17" } }, - "@ax/certificate-management-win-x64": { - "name": "@ax/certificate-management-win-x64", - "version": "1.1.3", - "integrity": "sha512-Ls+vwjL+HpGAFXwEmkGCrAieT4dShONMkmxehSFeo19D75IPsSntoR1fkavlTcQKSqD3sPSEf1YgNs6e1v8Siw==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/certificate-management-win-x64/-/certificate-management-win-x64-1.1.3.tgz", - "os": [ - "win32" - ], - "cpu": [ - "x64" - ], - "dependencies": {} - }, - "@ax/certificate-management-linux-x64": { - "name": "@ax/certificate-management-linux-x64", - "version": "1.1.3", - "integrity": "sha512-bJje00YlBTa0hODJ/CSQfZtDBafPfpb1EASIuiZK6peVTgEv9QFK1CCO6Z1qoyedvPAIqBoxJJZySCYoEnAMHQ==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/certificate-management-linux-x64/-/certificate-management-linux-x64-1.1.3.tgz", - "os": [ - "linux" - ], - "cpu": [ - "x64" - ], - "dependencies": {} - }, "@ax/diagnostic-buffer-win-x64": { "name": "@ax/diagnostic-buffer-win-x64", "version": "1.3.2", @@ -371,9 +359,9 @@ }, "@ax/hwc-win-x64": { "name": "@ax/hwc-win-x64", - "version": "2.0.51", - "integrity": "sha512-emVfvD5DTA5Y5czaJuE+fQEU9eh3wG1oWoivFfX156+LG7olfjtyWoE5WxTs1D3lWcCfosWtUBqlq7zjiFiUIw==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/hwc-win-x64/-/hwc-win-x64-2.0.51.tgz", + "version": "3.0.0", + "integrity": "sha512-rqU2J1fccx+sbM/ZQFJzM0gCD7BxIGP1r3Tzih3q9PRSVuKrIs8srFArMiDjN1KAP4BtZFix9knWGb7djlj6bQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/hwc-win-x64/-/hwc-win-x64-3.0.0.tgz", "os": [ "win32" ], @@ -384,9 +372,9 @@ }, "@ax/hwc-linux-x64": { "name": "@ax/hwc-linux-x64", - "version": "2.0.51", - "integrity": "sha512-ZDFDs9F/X873kT7SnBYIk6DAdrnpVRijbM+P0+ObjUuh/g8O5x8D0YFkWtQha/eQkmDJ/i0ApGrTYXHj9yTq8Q==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/hwc-linux-x64/-/hwc-linux-x64-2.0.51.tgz", + "version": "3.0.0", + "integrity": "sha512-apyeDcxX0XD3q/9Oc0SfPIO9GLn60owsDg/xlu4WNVVjP20OhMnoc5l1f+p1nOJMf0I/tMfe4UIPxKQ6LxSTVQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/hwc-linux-x64/-/hwc-linux-x64-3.0.0.tgz", "os": [ "linux" ], @@ -397,9 +385,9 @@ }, "@ax/mod-win-x64": { "name": "@ax/mod-win-x64", - "version": "1.4.6", - "integrity": "sha512-/X/BV+eIAnF9MS46dDBh/eQMoLuAmUg9b2Lr7EaECpb2CMFZOK+dV73r1MaBoaW13fyWDk9ITyE4SE3xgs8Dgg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-win-x64/-/mod-win-x64-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-xn1p650bNmPQ9sa1g0V/kJzxZj8yRDIoG+2oBnvQKR5mHCSIQ2RWJ8P+Rabvypdm6wcZ40oy64iG65e0DUNMtw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-win-x64/-/mod-win-x64-1.7.6.tgz", "os": [ "win32" ], @@ -410,9 +398,9 @@ }, "@ax/mod-linux-x64": { "name": "@ax/mod-linux-x64", - "version": "1.4.6", - "integrity": "sha512-B2JHQkBVAUmqQz8ZaL2AY2vB0r3qf06044hTQtvEAiXEnIrz+aDmlQfsioHGL2n/atrUpR0pgyqpRAbQAaZwLA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-linux-x64/-/mod-linux-x64-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-BhncasF8atzlWgQJsU5JgH2kbrUk9bVyk8ftrCY0md/XY5xQBqXFtk3CicljxWs8pEZWEk2/vCfevOnSyTj2/A==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mod-linux-x64/-/mod-linux-x64-1.7.6.tgz", "os": [ "linux" ], @@ -423,9 +411,9 @@ }, "@ax/mon-win-x64": { "name": "@ax/mon-win-x64", - "version": "1.4.6", - "integrity": "sha512-RJDHte8Snsx+PxojJ/Q7HdOnEzv7Ux7ceLaPwETSpoOC00a8a3oEBPdtJ97GlQAGEvqnjTF3G2kr0HNQLPIoKw==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-win-x64/-/mon-win-x64-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-plaSTwa17Vd44KN0OZ6QM0h1m4BuVebvVj48oVZjgcv5DOoEzas9W/jGdZYbEel0XSu+wiRMurAfSELVSStRsA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-win-x64/-/mon-win-x64-1.7.6.tgz", "os": [ "win32" ], @@ -436,9 +424,9 @@ }, "@ax/mon-linux-x64": { "name": "@ax/mon-linux-x64", - "version": "1.4.6", - "integrity": "sha512-fqLIIgepcqjcpkZdQiiVoz25YWA+5Qmgcw2d3DZBOI6EZ7+6qBZxjVolK+oM7FInR40f32n8eLLrAEzpyiAoxg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-linux-x64/-/mon-linux-x64-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-cWbb8nQV+rmKf+Hle7r51a5IpHGpFP6FpgeBZyWxqhVCNkDRsUxjH29DkiIFIgmraTRybIHiatyKq/DveoceWA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/mon-linux-x64/-/mon-linux-x64-1.7.6.tgz", "os": [ "linux" ], @@ -473,37 +461,11 @@ ], "dependencies": {} }, - "@ax/plc-info-linux-x64": { - "name": "@ax/plc-info-linux-x64", - "version": "3.0.0", - "integrity": "sha512-ThESJaGqEmBNNZ25R2i4xJzmnh81Sxd2yDHAV+v15Rl9iL/9BbIvshGPk87+7Y0EHmNXQ1lqeyLehxHR1huPng==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/plc-info-linux-x64/-/plc-info-linux-x64-3.0.0.tgz", - "os": [ - "linux" - ], - "cpu": [ - "x64" - ], - "dependencies": {} - }, - "@ax/plc-info-win-x64": { - "name": "@ax/plc-info-win-x64", - "version": "3.0.0", - "integrity": "sha512-xvT2U9eyim8YB2HM8so9JytvNBaYK0KOvI+SBj5vybmv5xunm7W+8fhBvRyKjNO9l6TRy6cqFBbtXwCk6dxs0A==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/plc-info-win-x64/-/plc-info-win-x64-3.0.0.tgz", - "os": [ - "win32" - ], - "cpu": [ - "x64" - ], - "dependencies": {} - }, "@ax/sdb-win-x64": { "name": "@ax/sdb-win-x64", - "version": "1.4.6", - "integrity": "sha512-bQejAXLApCzhQZtRkDtm+B9enHKNsWXX0Uu1PfLB8xtsECySo9qTz8UR9/ycnUgkDJA0No/mOX+PfjhR5vgLbg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-win-x64/-/sdb-win-x64-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-bx105Qsv0MaK6sOUl7EpX5+KprSpiAer2RWTxn7PKR/7R60eAwU7jwKQOZsq+nDO9KeErhMMNlUeNk6p3FF5hA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-win-x64/-/sdb-win-x64-1.7.6.tgz", "os": [ "win32" ], @@ -514,9 +476,9 @@ }, "@ax/sdb-linux-x64": { "name": "@ax/sdb-linux-x64", - "version": "1.4.6", - "integrity": "sha512-vvxqAlysF7JpCq4VxPPobmC+OWUwBJQGBgdOqoQdo0qiI6TnSJG/3kAtmT3uXt35hix/LWSARoDWTakqQQR/sA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-linux-x64/-/sdb-linux-x64-1.4.6.tgz", + "version": "1.7.6", + "integrity": "sha512-3bbzAYc939iCdzWoIZwKA5j9//mQUOd4XX3659MvQispcABv5vz3zZ8dwyf+nhLXmgTm6IHRwleI57ZsYAI0nA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdb-linux-x64/-/sdb-linux-x64-1.7.6.tgz", "os": [ "linux" ], @@ -527,9 +489,9 @@ }, "@ax/st-ls-win-x64": { "name": "@ax/st-ls-win-x64", - "version": "8.0.17", - "integrity": "sha512-i6L6N6SpU44okYIGpe+YQUidvdt8hgGpJi43Mg9iDc+PKTQwTs/3/0zrhMz3WLcZdiHdrSpg4+pDSN7thd3kBw==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-ls-win-x64/-/st-ls-win-x64-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-CPwfQ0F9exIjGOkbSAfFNY/Msbs8U+ED2nVT68hqk6X3tRQGOn5Trs4qfc+x9WLAXAeXUCUrkv+5CGElURaM5A==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-ls-win-x64/-/st-ls-win-x64-10.0.85.tgz", "os": [ "win32" ], @@ -540,9 +502,9 @@ }, "@ax/st-ls-linux-x64": { "name": "@ax/st-ls-linux-x64", - "version": "8.0.17", - "integrity": "sha512-kc14cdAQms4GsIXbH769rZhU2T8nD3ywlQPwmdQ9ES8K886Rx0fTwMxyDlxPBNWZw22iNrSvSzb2cjA44KltLg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-ls-linux-x64/-/st-ls-linux-x64-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-iGG7IloIUZuYlZEC/kVgmSqc6E7S59BXgtZAOarRRuIsMvfumFtKYwgCmmqsM1v4WHcwi8mp2TJpFGJ78l4Vew==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-ls-linux-x64/-/st-ls-linux-x64-10.0.85.tgz", "os": [ "linux" ], @@ -553,9 +515,9 @@ }, "@ax/stc-win-x64": { "name": "@ax/stc-win-x64", - "version": "8.0.17", - "integrity": "sha512-vOnWIY+dLfASN2s7exuy7pQU/KKTp9ej3uMn86vLTXtjF5YUECInNYOM9kY6hQdnJFJH6RirxzbiRJftjvLHuw==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-oQO4gqnQECgFeJgFQ9NpBp6823E+LaGN/7EptAQiXcOmxP7rLWx+k61x26ckjHOk/2gV6/FOz6Dqa6fYUumsjg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-10.0.85.tgz", "os": [ "win32" ], @@ -563,14 +525,14 @@ "x64" ], "dependencies": { - "@ax/st-docs": "8.0.17" + "@ax/st-docs": "10.0.85" } }, "@ax/stc-linux-x64": { "name": "@ax/stc-linux-x64", - "version": "8.0.17", - "integrity": "sha512-BnpkLdkExZ6n6wyKHprrCPfQOu4FK6FTTt8ieVbrjOwABSJxez3ls9GBEpUOJKxqJa05epbR2nIHYoOO1pFKtQ==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-4Hyi5+o1NT5+dAGwODznaVWd1yksNNXOp/5q+yvpWmuCJ74BLfMHLidK7ftLPQ68qFY9TEcpCjjuJ7Pdur5Wzw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-10.0.85.tgz", "os": [ "linux" ], @@ -578,14 +540,14 @@ "x64" ], "dependencies": { - "@ax/st-docs": "8.0.17" + "@ax/st-docs": "10.0.85" } }, "@ax/target-llvm-win-x64": { "name": "@ax/target-llvm-win-x64", - "version": "8.0.17", - "integrity": "sha512-L+wQWEYum8xff8PmUSr8Rs7Nc+ltJF0bClB7DwvcqG8O+ENUQEEp3fJeEr7SvWo9LzmmkOjnFf58+sv/qq9RIg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-llvm-win-x64/-/target-llvm-win-x64-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-VnD2ZkrwFM+DntZwVpVSwnQw6fNP7XPmhJFmuFMvzb+In82W6x8Rt9xpefh8Gin+qi9Ab3mrFP7wJSU36zNbxQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-llvm-win-x64/-/target-llvm-win-x64-10.0.85.tgz", "os": [ "win32" ], @@ -596,9 +558,9 @@ }, "@ax/target-llvm-linux-x64": { "name": "@ax/target-llvm-linux-x64", - "version": "8.0.17", - "integrity": "sha512-DPpHTGoAGQx0a4fF9AG82vHFDSIRp6Z4euZ6gju3H881ryq64V353Dc43B+xOeAJC2XU55uG9OpChfLUr4eyLQ==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-llvm-linux-x64/-/target-llvm-linux-x64-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-NiEYT+A0GwXjv6h9esPRBT2rMFWDUWKrs2/e5rlvYzBqun2JxEWGNs7TVZzI9lF/ugRJ2AGvi2WFNF29ohesZw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-llvm-linux-x64/-/target-llvm-linux-x64-10.0.85.tgz", "os": [ "linux" ], @@ -609,9 +571,9 @@ }, "@ax/target-mc7plus-win-x64": { "name": "@ax/target-mc7plus-win-x64", - "version": "8.0.17", - "integrity": "sha512-L5PGblyViDX6tILQ/N+Uv0f/m9hoa/z1NtxH60Yr+EW9W43udY+Yk+vEzzkxr5QiTBKm+inab+BSiOG3T1sOIA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-mc7plus-win-x64/-/target-mc7plus-win-x64-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-mF4e3chyTBhdG+/YKVBFt/qLRzq4rQbP/H8N8Je084GxYG8bz9XUKkMy3vrIs5Kf8PG3BO+kmCEsjqqircPkYw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-mc7plus-win-x64/-/target-mc7plus-win-x64-10.0.85.tgz", "os": [ "win32" ], @@ -622,9 +584,9 @@ }, "@ax/target-mc7plus-linux-x64": { "name": "@ax/target-mc7plus-linux-x64", - "version": "8.0.17", - "integrity": "sha512-uUUcvZ0NEy/efgVOBq+twsl5i7JX5a9HCQpN8LCapQ63rOoylWDoH1V5NGFKh0yW+3AT2YTduMFo5863RFf0tA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-mc7plus-linux-x64/-/target-mc7plus-linux-x64-8.0.17.tgz", + "version": "10.0.85", + "integrity": "sha512-caFRNigisDgE0UAXv123WY7qSt+goc0tY2a0Pnq1TMlK4d1IWOzCBgYKEBJe29FLohQZGG472/KWgUMEnow4vQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/target-mc7plus-linux-x64/-/target-mc7plus-linux-x64-10.0.85.tgz", "os": [ "linux" ], @@ -635,9 +597,9 @@ }, "@ax/trace-win-x64": { "name": "@ax/trace-win-x64", - "version": "2.8.1", - "integrity": "sha512-nc4aXwEJeSsbZjNe+mds5sQb3Fn+uDvKvUj4lrYHJkqBFp1JjzsPZKDUBXjyJs2s7GE+fHs8j19iQlvwtX0org==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/trace-win-x64/-/trace-win-x64-2.8.1.tgz", + "version": "2.9.0", + "integrity": "sha512-cWSDUbc8v1FNiIBq1Wk2ZMtuTbWNfGdbVRVVmq1XgxvwKncAsPgRMvUXM1Tv42sF9tI8ioIH0dRWel7U/PUGRw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/trace-win-x64/-/trace-win-x64-2.9.0.tgz", "os": [ "win32" ], @@ -648,9 +610,9 @@ }, "@ax/trace-linux-x64": { "name": "@ax/trace-linux-x64", - "version": "2.8.1", - "integrity": "sha512-sw9WYyMHxWLpfcOlb4vjZlnPmWsOP9xTfhBh7lzPsdzNn5AYYKOZ/BeUoctB3jDQOpqZIbI7oHTo0kbSasFcUg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/trace-linux-x64/-/trace-linux-x64-2.8.1.tgz", + "version": "2.9.0", + "integrity": "sha512-MJkRCJuKTX6DzpG30B+C0VuYeuQbjFbx5qAE5mJxij10WEAaf4MEylfBc394Tlsjcc9eJ99aSmIhxtI3SD3amQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/trace-linux-x64/-/trace-linux-x64-2.9.0.tgz", "os": [ "linux" ], @@ -659,21 +621,29 @@ ], "dependencies": {} }, + "@ax/st-docs": { + "name": "@ax/st-docs", + "version": "10.0.85", + "integrity": "sha512-AWnR0yWP7cO+Ep97VWDPPr0hT/y9SJYNtj81PZdmML60fa6OM6hdVGqKgEzgUz/jwfkNTdE7yHnyUewjmx3ehA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-10.0.85.tgz", + "dependencies": {} + }, "@ax/system-strings": { "name": "@ax/system-strings", - "version": "8.0.7", - "integrity": "sha512-JDuYJQx+l7R/xYAagCBSu+MsFFUoU2RTv5+Jl/5LYccgkF6dLavP2ooWUsWqYhlhGTdtqWBk16adpFW3g6ak8w==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-strings/-/system-strings-8.0.7.tgz", + "version": "10.0.24", + "integrity": "sha512-ujMjximtgfbifxVXG+a71oQWmtF2+cj3bR7GILTkbgRFNvg5/r5lBAWVnbCUtW+o1/3tPiLUj7yUqsqfqDXX2g==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-strings/-/system-strings-10.0.24.tgz", "dependencies": { - "@ax/system-math": "^8.0.7", - "@ax/system-datetime": "^8.0.7" + "@ax/system-math": "^10.0.24", + "@ax/system-datetime": "^10.0.24", + "@ax/system-conversion": "^10.0.24" } }, "@ax/axunitst-test-director-linux-x64": { "name": "@ax/axunitst-test-director-linux-x64", - "version": "6.0.6", - "integrity": "sha512-KoXjCcQpV7VhdXt0cnjSeNQWg1M+ROXDbL3Edradc+K7YY8QbIur2PhixOCGQFWC9BinlenRAZErHlNLwj/bfQ==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-test-director-linux-x64/-/axunitst-test-director-linux-x64-6.0.6.tgz", + "version": "8.0.33", + "integrity": "sha512-07ywM1OZiA2giHDXiGkVjNrgKI0TTasZo7tdpyg8mpkuAO7Tu8nXSBUFN/wGg3hVkmS81vh1cLnHHMIa3kkr9A==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-test-director-linux-x64/-/axunitst-test-director-linux-x64-8.0.33.tgz", "os": [ "linux" ], @@ -684,9 +654,9 @@ }, "@ax/axunitst-test-director-win-x64": { "name": "@ax/axunitst-test-director-win-x64", - "version": "6.0.6", - "integrity": "sha512-rVh46Od6xokP3VdVkekFAs0WslZvb1hNIwCdAHxtGPTWLh3meGtayMsXGgM0Ujze8bhOZiHuHOO2L8rKY1GI2g==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-test-director-win-x64/-/axunitst-test-director-win-x64-6.0.6.tgz", + "version": "8.0.33", + "integrity": "sha512-dGWVs5AqvedaUN52V8e+7KUq/UQju/ZXxP/W+vly9bG60sNIqLiLvtoNiBt32me4nWRDdKzhn+/uKCw5ITDJxA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-test-director-win-x64/-/axunitst-test-director-win-x64-8.0.33.tgz", "os": [ "win32" ], @@ -697,9 +667,9 @@ }, "@ax/build-native-winx64": { "name": "@ax/build-native-winx64", - "version": "16.0.3", - "integrity": "sha512-M1qk2yNNsGzz6NXKB0miyfOO4bpYkVcfnGhkHirXcJSLFnWDSx7hnRi0yhLp6jny99RkXEcRn9Cwx8lqynmUDg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/build-native-winx64/-/build-native-winx64-16.0.3.tgz", + "version": "16.1.17", + "integrity": "sha512-qv8r2ahouOQivHCWveGX/ktNTYvosf/aiHvZ6w1h7wAjAOgTjf7zhFZs07AquFmQ9rcUP0ZNPRBFziSvEmOmpA==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/build-native-winx64/-/build-native-winx64-16.1.17.tgz", "os": [ "win32" ], @@ -710,9 +680,9 @@ }, "@ax/build-native-linux": { "name": "@ax/build-native-linux", - "version": "16.0.3", - "integrity": "sha512-CfqbzR+wPnocP0+pDpb3cYBxdefkS6WvHbGaDNGAoCkK3Y8WnNfWbxXr37e5XIi7iPMZ8BONWaRFIN5h4RMeOA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/build-native-linux/-/build-native-linux-16.0.3.tgz", + "version": "16.1.17", + "integrity": "sha512-45mKw828x0akm1CENzNefVhggMApddltdCgocM/n6snMWxPRJCmhazFmVxTSomOnOsEMuZDsl0eHUl4IvO/oZQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/build-native-linux/-/build-native-linux-16.1.17.tgz", "os": [ "linux" ], @@ -721,20 +691,101 @@ ], "dependencies": {} }, - "@ax/st-docs": { - "name": "@ax/st-docs", - "version": "8.0.17", - "integrity": "sha512-bvMaT+GcSwF9ahzqI+wHBlCDfASqnJTDHwuBgVuR68u3R9cLaoOLnosw4HBoJRlBxWyooKB9bn+u++jRaekRNg==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-8.0.17.tgz", - "dependencies": {} - }, "@ax/system-datetime": { "name": "@ax/system-datetime", - "version": "8.0.7", - "integrity": "sha512-tidKSDNTNcCpjebJoO1w57bdCPcwz09KtgUBSsjDjV7w+iMvzVETiwOkurKX9ExpAZR5QMTLPMABOo+8AzwqiA==", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-datetime/-/system-datetime-8.0.7.tgz", + "version": "10.0.24", + "integrity": "sha512-L4IoFzmAoeLXR3g0ThGJM30iIDDnXNhCNVKnEF4+eKjED6GlLozohpvm+UjdTW4H0+5zplqbe82T1DSpgN7LZg==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-datetime/-/system-datetime-10.0.24.tgz", + "dependencies": {} + }, + "@ax/system-conversion": { + "name": "@ax/system-conversion", + "version": "10.0.24", + "integrity": "sha512-vHK3X8HnmZsGh/5KEeBmkJ9oZBPEFwxKx2Juu1HU9BN/er6cIQCRJpJOr3JehERxqaIT+s0+/V5rfTeWe1hkPQ==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-conversion/-/system-conversion-10.0.24.tgz", "dependencies": {} } }, - "workspaces": {} + "workspaces": {}, + "catalogs": { + "@ax/simatic-ax": { + "name": "@ax/simatic-ax", + "version": "2504.0.0", + "integrity": "sha512-eN/1a893Pm8y0RL9/fdeCi8wFrpUrGQ8AiEpD6C/nBbUu9BT2LthySN2x9Fp8fLirhZV+SnHU3GVvQiLgIutBw==", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/simatic-ax/-/simatic-ax-2504.0.0.tgz", + "dependencies": {}, + "catalogDependencies": { + "@ax/stc": "10.0.85", + "@ax/target-mc7plus": "10.0.85", + "@ax/target-llvm": "10.0.85", + "@ax/st-ls": "10.0.85", + "@ax/apax-build": "2.0.20", + "@ax/build-native": "16.1.17", + "@ax/axunitst": "8.0.33", + "@ax/axunitst-ls-contrib": "8.0.33", + "@ax/axunitst-library": "8.0.33", + "@ax/axunit-mocking": "8.0.33", + "@ax/sld": "3.2.4", + "@ax/plc-control": "1.2.50", + "@ax/mod": "1.7.6", + "@ax/mon": "1.7.6", + "@ax/sdb": "1.7.6", + "@ax/trace": "2.9.0", + "@ax/diagnostic-buffer": "1.3.2", + "@ax/certificate-management": "1.2.0", + "@ax/hardware-diagnostics": "0.3.0", + "@ax/simatic-1500-clocks": "10.0.6", + "@ax/simatic-1500-communication": "10.0.0", + "@ax/simatic-1500-diagnostics-hardware": "10.0.0", + "@ax/simatic-1500-distributedio": "10.0.1", + "@ax/simatic-1500-fileaccess": "9.0.3", + "@ax/simatic-1500-ip-configuration": "10.0.2", + "@ax/simatic-1500-motioncontrol-native-v5": "9.0.1", + "@ax/simatic-1500-motioncontrol-native-v6": "9.0.1", + "@ax/simatic-1500-motioncontrol-native-v7": "9.0.1", + "@ax/simatic-1500-motioncontrol-native-v8": "9.0.1", + "@ax/simatic-1500-motioncontrol-native-v9": "9.0.1", + "@ax/simatic-1500-motioncontrol-v7": "9.0.1", + "@ax/simatic-1500-motioncontrol-v7-mocking": "9.0.1", + "@ax/simatic-1500-motioncontrol-v8": "9.0.1", + "@ax/simatic-1500-motioncontrol-v8-mocking": "9.0.1", + "@ax/simatic-1500-motioncontrol-v9": "9.0.1", + "@ax/simatic-1500-motioncontrol-v9-mocking": "9.0.1", + "@ax/simatic-1500-tasks": "10.0.1", + "@ax/simatic-1500-alarming": "4.0.0", + "@ax/performance-info": "1.1.2", + "@ax/dcp-utility": "1.2.0", + "@ax/ax2tia": "11.0.18", + "@ax/plc-info": "3.1.0", + "@ax/hwc": "3.0.0", + "@ax/hw-s7-1500": "3.0.0", + "@ax/hwld": "3.0.0", + "@ax/system": "10.0.24", + "@ax/system-bitaccess": "10.0.24", + "@ax/system-conversion": "10.0.24", + "@ax/system-counters": "10.0.24", + "@ax/system-datetime": "10.0.24", + "@ax/system-edgedetection": "10.0.24", + "@ax/system-fastmath": "10.0.24", + "@ax/system-math": "10.0.24", + "@ax/system-selection": "10.0.24", + "@ax/system-serde": "10.0.24", + "@ax/system-strings": "10.0.24", + "@ax/system-timer": "10.0.24", + "@ax/simatic-1500-memoryaccess": "5.0.5", + "@ax/simatic-1500-hardware-utilities": "5.0.5", + "@ax/simatic-1500-crypto": "3.0.2", + "@ax/simatic-1500-diagnostics": "4.0.2", + "@ax/simatic-package-tool": "2.0.15", + "@ax/st-opcua.stc-plugin": "1.0.0", + "@ax/st-resources.stc-plugin": "3.0.23", + "@ax/xlad-transpile-cli": "1.2.0", + "@ax/st-lang-contrib-xlad": "1.2.0", + "@ax/simatic-1500-pointtopoint": "3.0.4", + "@ax/simatic-1500-modbusrtu": "3.0.5", + "@ax/simatic-1500-technology-objects": "3.0.8", + "@ax/sdk": "2504.0.0" + } + } + } } diff --git a/apax.yml b/apax.yml index 39a4961..1dab5b3 100644 --- a/apax.yml +++ b/apax.yml @@ -21,14 +21,16 @@ targets: - 'llvm' # Install settings installStrategy: strict -apaxVersion: 3.2.1 +apaxVersion: 3.5.0 +catalogs: + "@ax/simatic-ax": ^2504.0.0 # Dependencies devDependencies: - '@ax/sdk': ^2411.0.0 + "@ax/sdk": 2504.0.0 "@simatic-ax/snippetscollection": ^1.0.0 dependencies: - "@simatic-ax/io": ^7.1.0 - "@ax/system-timer": ^8.0.7 + "@ax/system-timer": 10.0.24 + "@simatic-ax/io": ^9.0.0 # Files which 'apax pack' will include files: - 'README.md' @@ -36,5 +38,5 @@ files: - 'changelog.md' - 'snippets' - 'docs' - - 'src' # ship library as src-files - # - 'bin' # ship library as bin-files + # - 'src' # ship library as src-files + - 'bin' # ship library as bin-files diff --git a/src/Bulbs/Bulb.st b/src/Bulbs/Bulb.st index d5e53fe..0724de8 100644 --- a/src/Bulbs/Bulb.st +++ b/src/Bulbs/Bulb.st @@ -7,7 +7,7 @@ NAMESPACE Simatic.Ax.SimpleControlModules /// Class to handle a bulb CLASS Bulb VAR PUBLIC - Output : IBinOutput; + Output : ItfBinOutput; END_VAR /// Switch the lamp on (value := TRUE) or off (value := FALSE) diff --git a/src/Bulbs/LightStack.st b/src/Bulbs/LightStack.st index eb90dd1..e7f7f82 100644 --- a/src/Bulbs/LightStack.st +++ b/src/Bulbs/LightStack.st @@ -7,10 +7,10 @@ NAMESPACE Simatic.Ax.SimpleControlModules CLASS LightStackRdYeGnBl VAR PUBLIC - QRed : IBinOutput; - QYellow : IBinOutput; - QGreen : IBinOutput; - QBlue : IBinOutput; + QRed : ItfBinOutput; + QYellow : ItfBinOutput; + QGreen : ItfBinOutput; + QBlue : ItfBinOutput; END_VAR /// Switch on the lamp of color c diff --git a/src/Encoder/EncoderA.st b/src/Encoder/EncoderA.st index 977fc1e..425f3dd 100644 --- a/src/Encoder/EncoderA.st +++ b/src/Encoder/EncoderA.st @@ -7,7 +7,7 @@ NAMESPACE Simatic.Ax.SimpleControlModules CLASS EncoderA EXTENDS AbstractEncoder VAR PUBLIC - SignalA : IBinSignal; + SignalA : ItfBinSignal; END_VAR @@ -30,7 +30,7 @@ NAMESPACE Simatic.Ax.SimpleControlModules /// A : A signal from encoder METHOD ForwardPulse : BOOL VAR_INPUT - A : IBinSignal; + A : ItfBinSignal; END_VAR ForwardPulse := A.QRis() OR A.QFal(); END_METHOD diff --git a/src/Encoder/EncoderAB.st b/src/Encoder/EncoderAB.st index b246a61..c5277b3 100644 --- a/src/Encoder/EncoderAB.st +++ b/src/Encoder/EncoderAB.st @@ -5,16 +5,16 @@ NAMESPACE Simatic.Ax.SimpleControlModules /// CLASS EncoderAB EXTENDS AbstractEncoder VAR PUBLIC - SignalA : IBinSignal; - SignalB : IBinSignal; + SignalA : ItfBinSignal; + SignalB : ItfBinSignal; END_VAR /// Evaluate encoder for A B track METHOD PUBLIC OVERRIDE Evaluate VAR_TEMP - _A : IBinSignal; - _B : IBinSignal; + _A : ItfBinSignal; + _B : ItfBinSignal; END_VAR IF (_countMode = CountMode#Forward) THEN _A := SignalA; @@ -47,8 +47,8 @@ NAMESPACE Simatic.Ax.SimpleControlModules /// Returns Encoder signal A and/or B made pulse forward METHOD ForwardPulse : BOOL VAR_INPUT - A : IBinSignal; - B : IBinSignal; + A : ItfBinSignal; + B : ItfBinSignal; END_VAR ForwardPulse := A.QRis() AND NOT(B.Q()) OR A.Q() AND B.QRis() @@ -62,8 +62,8 @@ NAMESPACE Simatic.Ax.SimpleControlModules /// Returns Encoder signal A and/or B made pulse reverse METHOD ReversePulse : BOOL VAR_INPUT - A : IBinSignal; - B : IBinSignal; + A : ItfBinSignal; + B : ItfBinSignal; END_VAR ReversePulse := A.QRis() AND B.Q() OR NOT(A.Q()) AND B.QRis() diff --git a/src/Pusher/PusherBiDirTimeBased.st b/src/Pusher/PusherBiDirTimeBased.st index d7134d2..de34b3a 100644 --- a/src/Pusher/PusherBiDirTimeBased.st +++ b/src/Pusher/PusherBiDirTimeBased.st @@ -5,8 +5,8 @@ NAMESPACE Simatic.Ax.SimpleControlModules CLASS PusherBiDirTimeBased IMPLEMENTS IPusher VAR PUBLIC - ControlPush : IBinOutput; - ControlRetract : IBinOutput; + ControlPush : ItfBinOutput; + ControlRetract : ItfBinOutput; OnDuration : TIME; OffDuration : TIME; AutoRetract : BOOL := TRUE; diff --git a/src/Pusher/PusherTimeBased.st b/src/Pusher/PusherTimeBased.st index 46267bf..81e605f 100644 --- a/src/Pusher/PusherTimeBased.st +++ b/src/Pusher/PusherTimeBased.st @@ -5,7 +5,7 @@ NAMESPACE Simatic.Ax.SimpleControlModules CLASS PusherTimeBased IMPLEMENTS IPusher VAR PUBLIC - ControlPush : IBinOutput; + ControlPush : ItfBinOutput; OnDuration : TIME; END_VAR VAR From 305535ea2bb30e60b04ed2750244bfc3042e7b66 Mon Sep 17 00:00:00 2001 From: Thomas Drosdzoll Date: Wed, 7 May 2025 13:04:40 +0200 Subject: [PATCH 5/7] Update package-development-workflow.yml --- .github/workflows/package-development-workflow.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package-development-workflow.yml b/.github/workflows/package-development-workflow.yml index 7abf900..2aae90c 100644 --- a/.github/workflows/package-development-workflow.yml +++ b/.github/workflows/package-development-workflow.yml @@ -7,10 +7,7 @@ on: push: branches: - 'main' # runs the workflow, once new changes have been integrated to main - - 'main/**' # runs the workflow, once new changes have been integrated to a sub-branch of main pull_request: - branches: - - 'main' # run workflow in the scope of pull requests towards main workflow_call: secrets: APAX_TOKEN: @@ -30,7 +27,7 @@ jobs: name: Build and Test runs-on: ubuntu-24.04 container: - image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.4.2 + image: ghcr.io/simatic-ax/ci-images/apax-ci-image:3.5.0 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -84,4 +81,4 @@ jobs: bin/1500 bin/llvm retention-days: 90 - if-no-files-found: error \ No newline at end of file + if-no-files-found: error From e3136d5b6bdd921361dcc00237158151b7d55475 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Wed, 7 May 2025 13:12:19 +0200 Subject: [PATCH 6/7] deps with ranges --- apax.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apax.yml b/apax.yml index 1dab5b3..070ea85 100644 --- a/apax.yml +++ b/apax.yml @@ -26,10 +26,10 @@ catalogs: "@ax/simatic-ax": ^2504.0.0 # Dependencies devDependencies: - "@ax/sdk": 2504.0.0 + "@ax/sdk": ^2504.0.0 "@simatic-ax/snippetscollection": ^1.0.0 dependencies: - "@ax/system-timer": 10.0.24 + "@ax/system-timer": ^10.0.24 "@simatic-ax/io": ^9.0.0 # Files which 'apax pack' will include files: From f7871ba0706e93c3ffac6ca3cfd85e377f9d15a8 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Wed, 7 May 2025 13:15:10 +0200 Subject: [PATCH 7/7] lock.json update --- apax-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apax-lock.json b/apax-lock.json index 77812e2..3ad93b0 100644 --- a/apax-lock.json +++ b/apax-lock.json @@ -7,11 +7,11 @@ "name": "@simatic-ax/simple-control-modules", "version": "0.0.0-placeholder", "dependencies": { - "@ax/system-timer": "10.0.24", + "@ax/system-timer": "^10.0.24", "@simatic-ax/io": "^9.0.0" }, "devDependencies": { - "@ax/sdk": "2504.0.0", + "@ax/sdk": "^2504.0.0", "@simatic-ax/snippetscollection": "^1.0.0" }, "catalogs": {