diff --git a/Logical/MachCtrl/MachCtrl/Cyclic.st b/Logical/MachCtrl/MachCtrl/Cyclic.st
index c681ff9..30532dc 100644
--- a/Logical/MachCtrl/MachCtrl/Cyclic.st
+++ b/Logical/MachCtrl/MachCtrl/Cyclic.st
@@ -109,6 +109,7 @@ PROGRAM _CYCLIC
//Stati
+ VCButtons.AutoStop.usStatus.0 := (enStepAuto <= enAutoStep_WAIT_START) OR (lMachine.enMode <> enMACH_AUTOMATIC);
@@ -144,7 +145,7 @@ PROGRAM _CYCLIC
ELSIF (lMachine.enMode = enMACH_AUTOMATIC) THEN
//Buttons Anzeigen
VCButtons.AutoRequestHome.usStatus.0 := (enStepAuto > enAutoStep_WAIT_START);
-
+ VCButtons.AutoStop.usStatus.0 := (enStepAuto <= enAutoStep_WAIT_START);
VCStatus.usParameter.1 := (enStepAuto > enAutoStep_WAIT_START);
//Eingabefelder
@@ -269,6 +270,11 @@ PROGRAM _CYCLIC
MpFUB.AxBasic_1.MoveVelocity := Parameter.bEnableDrum1 AND (Times.diSteptime < Parameter.udSetCycletime);
MpFUB.AxBasic_2.MoveVelocity := Parameter.bEnableDrum2 AND (Times.diSteptime < Parameter.udSetCycletime);
+ IF VCButtons.AutoStop.bCommand THEN
+ TimesLatch.diSteptime := gdiSystemTime - Parameter.udSetCycletime;
+ States.usCurrentCylcle := Parameter.usCycles;
+ END_IF
+
IF (Times.diSteptime > Parameter.udSetCycletime) THEN
MpFUB.AxBasic_1.Stop := Parameter.bEnableDrum1;
MpFUB.AxBasic_2.Stop := Parameter.bEnableDrum2;
@@ -290,6 +296,9 @@ PROGRAM _CYCLIC
//---------------------------
enAutoStep_PAUSE:
bTransitionCondition := (Times.diSteptime > Parameter.udPausetime);
+ IF VCButtons.AutoStop.bCommand THEN
+ States.usCurrentCylcle := Parameter.usCycles;
+ END_IF
IF bTransitionCondition THEN
States.usCurrentCylcle := States.usCurrentCylcle + 1;
IF (States.usCurrentCylcle > Parameter.usCycles) THEN
@@ -316,7 +325,7 @@ PROGRAM _CYCLIC
//Fehlermeldungen
DoAlarms;
- gPB2.bOuWhite := (enStepAuto = enAutoStep_WAIT_START) AND (Parameter.bEnableDrum1 AND Parameter.bEnableDrum2);
+ gPB2.bOuWhite := (enStepAuto = enAutoStep_WAIT_START) AND (Parameter.bEnableDrum1 OR Parameter.bEnableDrum2);
gPB2.bOuGreen := (enStepAuto > enAutoStep_TEST_TORQUE);
diff --git a/Logical/MachCtrl/MachCtrl/Types.typ b/Logical/MachCtrl/MachCtrl/Types.typ
index c423b3c..38e72bd 100644
--- a/Logical/MachCtrl/MachCtrl/Types.typ
+++ b/Logical/MachCtrl/MachCtrl/Types.typ
@@ -86,6 +86,7 @@ TYPE
Axis2Right : gtyp_VCButton;
AutoStartHome : gtyp_VCButton; (*Starte Grundstellung*)
AutoRequestHome : gtyp_VCButton; (*Grundstellung Anfordern (Abbruch Automatik)*)
+ AutoStop : gtyp_VCButton; (*Stoppen der Bewegung*)
END_STRUCT;
typ_VCStatus : STRUCT (*Status Datenpunkte für Eingabefelder etc*)
usDrumSelection : USINT; (*Status Trommeln wählen*)
diff --git a/Logical/VCShared/DataSources/DataSource.dso b/Logical/VCShared/DataSources/DataSource.dso
index b5223cf..7f51b13 100644
--- a/Logical/VCShared/DataSources/DataSource.dso
+++ b/Logical/VCShared/DataSources/DataSource.dso
@@ -25,32 +25,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -103,6 +77,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Logical/Vsualization/Visu/Pages/pg10_MainPage.page b/Logical/Vsualization/Visu/Pages/pg10_MainPage.page
index d6828e9..654b397 100644
--- a/Logical/Vsualization/Visu/Pages/pg10_MainPage.page
+++ b/Logical/Vsualization/Visu/Pages/pg10_MainPage.page
@@ -521,6 +521,7 @@
+
@@ -529,6 +530,7 @@
+
@@ -588,7 +590,7 @@
-
+
@@ -877,6 +879,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -911,6 +935,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Logical/Vsualization/Visu/VirtualKeys.vcvk b/Logical/Vsualization/Visu/VirtualKeys.vcvk
index 823d48f..352bca8 100644
--- a/Logical/Vsualization/Visu/VirtualKeys.vcvk
+++ b/Logical/Vsualization/Visu/VirtualKeys.vcvk
@@ -1681,4 +1681,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/Logical/gAxisobj/gAxisa/gAxisa.apt b/Logical/gAxisobj/gAxisa/gAxisa.apt
index eb2c2d2..b0936d8 100644
--- a/Logical/gAxisobj/gAxisa/gAxisa.apt
+++ b/Logical/gAxisobj/gAxisa/gAxisa.apt
@@ -1,5 +1,7 @@

-
+
-
+
+
+
\ No newline at end of file