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
576 changes: 304 additions & 272 deletions apax-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ devDependencies:
"@simatic-ax/snippetscollection": ^1.1.0
dependencies:
"@ax/system-timer": ^10.2.7
"@simatic-ax/io": ^10.0.1
"@simatic-ax/io": ^11.0.0
# Files which 'apax pack' will include
files:
- 'README.md'
Expand Down
2 changes: 1 addition & 1 deletion src/Bulbs/Bulb.st
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ NAMESPACE Simatic.Ax.SimpleControlModules
/// Class to handle a bulb
CLASS Bulb
VAR PUBLIC
Output : ItfBinOutput;
Output : IBinOutput;
END_VAR

/// Switch the lamp on (value := TRUE) or off (value := FALSE)
Expand Down
8 changes: 4 additions & 4 deletions src/Bulbs/LightStack.st
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ NAMESPACE Simatic.Ax.SimpleControlModules

CLASS LightStackRdYeGnBl
VAR PUBLIC
QRed : ItfBinOutput;
QYellow : ItfBinOutput;
QGreen : ItfBinOutput;
QBlue : ItfBinOutput;
QRed : IBinOutput;
QYellow : IBinOutput;
QGreen : IBinOutput;
QBlue : IBinOutput;
END_VAR

/// Switch on the lamp of color c
Expand Down
4 changes: 2 additions & 2 deletions src/Encoder/EncoderA.st
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ NAMESPACE Simatic.Ax.SimpleControlModules
CLASS EncoderA EXTENDS AbstractEncoder

VAR PUBLIC
SignalA : ItfBinSignal;
SignalA : IBinSignal;
END_VAR


Expand All @@ -30,7 +30,7 @@ NAMESPACE Simatic.Ax.SimpleControlModules
/// A : A signal from encoder
METHOD ForwardPulse : BOOL
VAR_INPUT
A : ItfBinSignal;
A : IBinSignal;
END_VAR
ForwardPulse := A.QRis() OR A.QFal();
END_METHOD
Expand Down
16 changes: 8 additions & 8 deletions src/Encoder/EncoderAB.st
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ NAMESPACE Simatic.Ax.SimpleControlModules
/// </summary>
CLASS EncoderAB EXTENDS AbstractEncoder
VAR PUBLIC
SignalA : ItfBinSignal;
SignalB : ItfBinSignal;
SignalA : IBinSignal;
SignalB : IBinSignal;
END_VAR

/// Evaluate encoder for A B track
METHOD PUBLIC OVERRIDE Evaluate

VAR_TEMP
_A : ItfBinSignal;
_B : ItfBinSignal;
_A : IBinSignal;
_B : IBinSignal;
END_VAR
IF (_countMode = CountMode#Forward) THEN
_A := SignalA;
Expand Down Expand Up @@ -47,8 +47,8 @@ NAMESPACE Simatic.Ax.SimpleControlModules
/// Returns Encoder signal A and/or B made pulse forward
METHOD ForwardPulse : BOOL
VAR_INPUT
A : ItfBinSignal;
B : ItfBinSignal;
A : IBinSignal;
B : IBinSignal;
END_VAR
ForwardPulse := A.QRis() AND NOT(B.Q())
OR A.Q() AND B.QRis()
Expand All @@ -62,8 +62,8 @@ NAMESPACE Simatic.Ax.SimpleControlModules
/// Returns Encoder signal A and/or B made pulse reverse
METHOD ReversePulse : BOOL
VAR_INPUT
A : ItfBinSignal;
B : ItfBinSignal;
A : IBinSignal;
B : IBinSignal;
END_VAR
ReversePulse := A.QRis() AND B.Q()
OR NOT(A.Q()) AND B.QRis()
Expand Down
4 changes: 2 additions & 2 deletions src/Pusher/PusherBiDirTimeBased.st
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ NAMESPACE Simatic.Ax.SimpleControlModules
CLASS PusherBiDirTimeBased IMPLEMENTS IPusher

VAR PUBLIC
ControlPush : ItfBinOutput;
ControlRetract : ItfBinOutput;
ControlPush : IBinOutput;
ControlRetract : IBinOutput;
OnDuration : TIME;
OffDuration : TIME;
AutoRetract : BOOL := TRUE;
Expand Down
2 changes: 1 addition & 1 deletion src/Pusher/PusherTimeBased.st
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ NAMESPACE Simatic.Ax.SimpleControlModules
CLASS PusherTimeBased IMPLEMENTS IPusher

VAR PUBLIC
ControlPush : ItfBinOutput;
ControlPush : IBinOutput;
OnDuration : TIME;
END_VAR
VAR
Expand Down
Loading