From d785cbdf806abd92b5d8f83347d56dbcfa60ef1e Mon Sep 17 00:00:00 2001
From: Michael Rest <mir@mir.systems>
Date: Thu, 22 Mar 2018 10:21:45 +0100
Subject: [PATCH] =?UTF-8?q?Vor=20Ort=20Temperatur=C3=BCberwachung=20deakti?=
 =?UTF-8?q?viert=20Stop-Schaltfl=C3=A4che=20eingerichtet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Logical/MachCtrl/MachCtrl/Cyclic.st           | 13 ++++-
 Logical/MachCtrl/MachCtrl/Types.typ           |  1 +
 Logical/VCShared/DataSources/DataSource.dso   | 48 +++++++++----------
 .../Visu/Pages/pg10_MainPage.page             | 42 +++++++++++++++-
 Logical/Vsualization/Visu/VirtualKeys.vcvk    |  4 ++
 Logical/gAxisobj/gAxisa/gAxisa.apt            |  6 ++-
 6 files changed, 83 insertions(+), 31 deletions(-)

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 @@
         <Folder Name="VCButtons">
           <Property Name="Description" Value=""/>
           <Property Name="FolderType" Value="Struct"/>
-          <Folder Name="AutoStartHome">
-            <Property Name="Description" Value=""/>
-            <Property Name="FolderType" Value="Struct"/>
-            <DataPoint Name="bCommand">
-              <Property Name="ConnectedBySharedResource" Value="False"/>
-              <Property Name="ConnectingVisus" Value="Vsualization\Visu"/>
-              <Property Name="Description" Value=""/>
-              <Property Name="PLCType" Value="BOOL"/>
-              <Property Name="UpdateTime" Value="Default"/>
-              <Property Name="UserID" Value="None"/>
-              <Property Name="VCType" Value="BOOL"/>
-            </DataPoint>
-          </Folder>
-          <Folder Name="AutoRequestHome">
-            <Property Name="Description" Value=""/>
-            <Property Name="FolderType" Value="Struct"/>
-            <DataPoint Name="bCommand">
-              <Property Name="ConnectedBySharedResource" Value="False"/>
-              <Property Name="ConnectingVisus" Value="Vsualization\Visu"/>
-              <Property Name="Description" Value=""/>
-              <Property Name="PLCType" Value="BOOL"/>
-              <Property Name="UpdateTime" Value="Default"/>
-              <Property Name="UserID" Value="None"/>
-              <Property Name="VCType" Value="BOOL"/>
-            </DataPoint>
-          </Folder>
           <Folder Name="Axis1Left">
             <Property Name="Description" Value=""/>
             <Property Name="FolderType" Value="Struct"/>
@@ -103,6 +77,28 @@
               <Property Name="VCType" Value="BOOL"/>
             </DataPoint>
           </Folder>
+          <Folder Name="AutoStop">
+            <Property Name="Description" Value=""/>
+            <Property Name="FolderType" Value="Struct"/>
+            <DataPoint Name="usStatus">
+              <Property Name="ConnectedBySharedResource" Value="False"/>
+              <Property Name="ConnectingVisus" Value="Vsualization\Visu"/>
+              <Property Name="Description" Value=""/>
+              <Property Name="PLCType" Value="USINT"/>
+              <Property Name="UpdateTime" Value="Default"/>
+              <Property Name="UserID" Value="None"/>
+              <Property Name="VCType" Value="INTEGER"/>
+            </DataPoint>
+            <DataPoint Name="bCommand">
+              <Property Name="ConnectedBySharedResource" Value="False"/>
+              <Property Name="ConnectingVisus" Value="Vsualization\Visu"/>
+              <Property Name="Description" Value=""/>
+              <Property Name="PLCType" Value="BOOL"/>
+              <Property Name="UpdateTime" Value="Default"/>
+              <Property Name="UserID" Value="None"/>
+              <Property Name="VCType" Value="BOOL"/>
+            </DataPoint>
+          </Folder>
         </Folder>
         <Folder Name="MpFUB">
           <Property Name="Description" Value=""/>
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 @@
           <Text ID="141864" Value="Zyluszeit / Pause"/>
           <Text ID="147629" Value="Zyklen Soll / Ist"/>
           <Text ID="147630" Value="Drehzahl"/>
+          <Text ID="147746" Value="Stop"/>
         </TextLayer>
         <IndexMap>
           <Index ID="128185" Value="2"/>
@@ -529,6 +530,7 @@
           <Index ID="141864" Value="33"/>
           <Index ID="147629" Value="10"/>
           <Index ID="147630" Value="12"/>
+          <Index ID="147746" Value="6"/>
         </IndexMap>
       </TextGroup>
       <Controls>
@@ -588,7 +590,7 @@
           <Property Name="TextIndexOffset" Value="0"/>
           <Property Name="TextSource" Value="MultipleTexts"/>
           <Property Name="Top" Value="255"/>
-          <Property Name="Width" Value="330"/>
+          <Property Name="Width" Value="355"/>
         </Control>
         <Control ClassId="0x00001004" Name="LblAutoStep">
           <Property Name="AlignmentHorizontal" Value="Center"/>
@@ -877,6 +879,28 @@
           <Property Name="Top" Value="400"/>
           <Property Name="Width" Value="180"/>
         </Control>
+        <Control ClassId="0x00001002" Name="Button_Auto">
+          <Property Name="BitmapIndexDatapoint" Value="None"/>
+          <Property Name="BitmapSource" Value="None"/>
+          <Property Name="ControlID" Value="0"/>
+          <Property Name="Description" Value=""/>
+          <Property Name="EmbVirtualKey" Value="Source[local].VirtualKey[%embVirtualKey_93]"/>
+          <Property Name="Height" Value="40"/>
+          <Property Name="KeyMatrixOffset" Value="None"/>
+          <Property Name="Left" Value="555"/>
+          <Property Name="PressedBitmapSource" Value="Source[embedded].Property[BitmapSource]"/>
+          <Property Name="PressedTextSource" Value="Source[embedded].Property[TextSource]"/>
+          <Property Name="StatusDatapoint" Value="Source[global].Variable[DataSource.MachCtrl.MachCtrl.VCButtons.AutoStop.usStatus]"/>
+          <Property Name="StyleClass" Value="Source[relative:StyleGroup].StyleClass[Default]"/>
+          <Property Name="TextGroup" Value="Source[embedded].TextGroup"/>
+          <Property Name="TextIndex" Value="6"/>
+          <Property Name="TextIndexDatapoint" Value="None"/>
+          <Property Name="TextSimulationValue" Value="0"/>
+          <Property Name="TextSource" Value="SingleText"/>
+          <Property Name="Top" Value="215"/>
+          <Property Name="VirtualKey" Value="Source[local].VirtualKey[%embVirtualKey_93]"/>
+          <Property Name="Width" Value="100"/>
+        </Control>
       </Controls>
       <KeyMapping>
         <VirtualKey Name="%embVirtualKey_135">
@@ -911,6 +935,22 @@
             </KeyAction>
           </KeyActions>
         </VirtualKey>
+        <VirtualKey Name="%embVirtualKey_93">
+          <Property Name="Description" Value=""/>
+          <Property Name="VirtualKey_LED" Value="False"/>
+          <KeyActions>
+            <KeyAction ClassId="0x0000016B">
+              <Property Name="CompletionDatapoint" Value="None"/>
+              <Property Name="CompletionValue" Value="0"/>
+              <Property Name="Description" Value=""/>
+              <Property Name="Locking" Value="Never"/>
+              <Property Name="Name" Value="Action_0"/>
+              <Property Name="ResetValue" Value="0"/>
+              <Property Name="SetValue" Value="1"/>
+              <Property Name="ValueDatapoint" Value="Source[global].Variable[DataSource.MachCtrl.MachCtrl.VCButtons.AutoStop.bCommand]"/>
+            </KeyAction>
+          </KeyActions>
+        </VirtualKey>
       </KeyMapping>
     </Layer>
     <Layer Name="Default">
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 @@
     <Property Name="Description" Value=""/>
     <Property Name="VirtualKey_LED" Value="False"/>
   </VirtualKey>
+  <VirtualKey Name="%embVirtualKey_93">
+    <Property Name="Description" Value=""/>
+    <Property Name="VirtualKey_LED" Value="False"/>
+  </VirtualKey>
 </KeyMapping>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?AutomationStudio Version=?>
+<?AutomationStudio Version=4.3.4.121 SP?>
 <AcoposParameterTable>
-  <Root Name="Parameters" />
+  <Root Name="Parameters">
+    <Parameter Name="MOTOR_TEMPSENS_TYPE" ID="1215" Value="0" Description="Temperature sensor: Type" />
+  </Root>
 </AcoposParameterTable>
\ No newline at end of file