Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update windowtracking #1

Merged
merged 2 commits into from
Jan 20, 2022
Merged

Update windowtracking #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7721c86
update of libs
sjuergen Jan 20, 2022
dda3a94
update mon file
sjuergen Jan 20, 2022
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
3 changes: 1 addition & 2 deletions Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Sorting Line Application Example

## Description
Sorting line with a
by using the library `Window Tracking`
Sorting line by using the library `WindowTracking`

### Layout

Expand Down
18 changes: 9 additions & 9 deletions apax.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,10 @@
dependencies:
"@ax/system-timer" "1.0.12"

"@simatic-ax/simple-control-modules@0.0.5":
version "0.0.5"
resolved "https://npm.pkg.github.com/download/@simatic-ax/simple-control-modules/0.0.5/aa0814e7b96053af27d2461d1be92e6cf055da1ff26769307e88a9b59efb67c8#819341f1768a3da9faaa6ad101a74854dba85996"
integrity sha512-I62E9twABPiWKnwNFEmuT/Nnz6V4J51rTMCy8vYaqOjf+9q7PTpiiG5DYYHJLYcnY9jZ8nPWop+9wiKK5OnFpw==
"@simatic-ax/simple-control-modules@0.1.0":
version "0.1.0"
resolved "https://npm.pkg.github.com/download/@simatic-ax/simple-control-modules/0.1.0/5790f5e9822898a36fad6337a01575e2f47d95a2a315456015363c9abebad0b2#01b07545c4e7146522ce6d7ea7cd6f40ba0a79d3"
integrity sha512-y6K0240zSX8/9Purjoi2kI3YDq+OkihgXuzKjDU552T82XkbMoySe4mDpNV8hC+LSmmTtVOxlz9rY48zopIeuA==
dependencies:
"@simatic-ax/io" "0.1.2"

Expand All @@ -387,10 +387,10 @@
resolved "https://npm.pkg.github.com/download/@simatic-ax/snippetscollection/0.0.6/0c5dfb121a478816973432d8fefd7c4868da78031f8fe12eeacb067e6a7656b4#9bfb71c62d44e7b95ab0798e9ac46366290884fc"
integrity sha512-BohhLC7n3pHP5QRPaNXbt0tQXNgGKvuWBsohJ+Jzj+tgOU9o6K6i6l8CHaTsFev5Lq0I08jRyfIdCJ/gfJy+BA==

"@simatic-ax/windowtracking@0.0.11":
version "0.0.11"
resolved "https://npm.pkg.github.com/download/@simatic-ax/windowtracking/0.0.11/50900b19e0a6e1d808aabe4f97e6de648a322f569b6f7645563595bb0dcbb4ac#6c491c2e4a54ac8d43e515260900e4bd8dccdd39"
integrity sha512-VATB46nIKgY3USdC0vIPY1tWH1EhRXKTOalGoGPyI2jbImqQzZusbRY/4Z8ZJZdlkteokEQk0QrVplILscslYw==
"@simatic-ax/windowtracking@0.1.0":
version "0.1.0"
resolved "https://npm.pkg.github.com/download/@simatic-ax/windowtracking/0.1.0/7a3d6619cdd13c93d381515dee2c53a24f67f71cc6bc9cb3262d1630ff18dd97#b0109f2e133e7573d9cfefc6581a4ddd48d0bbd8"
integrity sha512-na0Zv4h+hGkAdMKDYA2FI+GX0gXTQ1bJxS+UbvMSr8FLjhK7wC6i1l3D6ncmL3Kksifj5nATd/pRYNzGmYbG8Q==
dependencies:
"@simatic-ax/collections" "0.1.1"
"@simatic-ax/simple-control-modules" "0.0.5"
"@simatic-ax/simple-control-modules" "0.1.0"
2 changes: 1 addition & 1 deletion apax.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ devDependencies:
registries:
'@simatic-ax': 'https://npm.pkg.github.com/'
dependencies:
"@simatic-ax/windowtracking": 0.0.11
"@simatic-ax/windowtracking": 0.1.0
10 changes: 5 additions & 5 deletions src/EncoderMock.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ USING Simatic.Ax.SimpleControlModules;

CLASS EncoderMock IMPLEMENTS IEncoder
VAR
_value : DINT;
_value : LINT;
END_VAR

METHOD PUBLIC Evaluate
Expand All @@ -16,13 +16,13 @@ CLASS EncoderMock IMPLEMENTS IEncoder

METHOD PUBLIC SetValue
VAR_INPUT
value : DINT;
value : LINT;
END_VAR
_value := value;
;
END_METHOD

METHOD PUBLIC GetValue : DINT
METHOD PUBLIC GetValue : LINT
GetValue := _value;
END_METHOD

Expand All @@ -34,15 +34,15 @@ CLASS EncoderMock IMPLEMENTS IEncoder
;
END_METHOD

METHOD PUBLIC RelativeCount : DINT
METHOD PUBLIC RelativeCount : LINT
;
END_METHOD

METHOD PUBLIC ResetRelative
;
END_METHOD

METHOD PUBLIC GetModulo : DINT
METHOD PUBLIC GetModulo : LINT
GetModulo := 4096;
END_METHOD
END_CLASS
2 changes: 2 additions & 0 deletions src/EncoderProgram.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
PROGRAM EncoderProgram
VAR_EXTERNAL
Enocder : EncoderMock;


END_VAR

// Increase the encoder value by 10 by every 10ms --> speed of 1m/s
Expand Down
9 changes: 8 additions & 1 deletion watchlist/mon.mon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
WindowList._head
WindowList._tail
WindowList._tranportWindowListStorage[0]._actualPos
WindowList._tranportWindowListStorage[5]._actualPos
WindowList._tranportWindowListStorage[10]._actualPos
WindowList._tranportWindowListStorage[15]._actualPos
WindowList._tranportWindowListStorage[20]._actualPos
WindowList._tranportWindowListStorage[25]._actualPos
WindowList._tranportWindowListStorage[30]._actualPos
WindowList._tranportWindowListStorage[35]._actualPos
Enocder._value

ExitPoint101._activations
Expand All @@ -16,4 +23,4 @@ WindowsInList
Exit101._ItemsSorted
Exit201._ItemsSorted
Exit301._ItemsSorted
Exit401._ItemsSorted
Exit401._ItemsSorted