Added swift task (#6)

TcOpenGroup · Jun 30, 2021 · 8711545 · 8711545
1 parent 709b7ae
commit 8711545
Show file tree

Hide file tree

Showing 6 changed files with 385 additions and 7 deletions.
diff --git a/HMI/MainWindow.xaml b/HMI/MainWindow.xaml
@@ -132,17 +132,18 @@
                 </Grid>
                 <UniformGrid
                     Grid.Row="2"
-                    Columns="3"
+                    Columns="4"
                     Rows="0">
                     <UniformGrid.Resources>
                         <Style TargetType="vortex:RenderableContentControl">
                             <Setter Property="Margin" Value="25" />
-                            <Setter Property="Width" Value="300" />
+                            <Setter Property="Width" Value="250" />
                         </Style>
                     </UniformGrid.Resources>
                     <vortex:RenderableContentControl DataContext="{Binding PlcHammer.TECH_MAIN._app._station001._groundModeTask}" />
                     <vortex:RenderableContentControl DataContext="{Binding PlcHammer.TECH_MAIN._app._station001._automatModeTask}" />
                     <vortex:RenderableContentControl DataContext="{Binding PlcHammer.TECH_MAIN._app._station001._serviceModeTask}" />
+                    <vortex:RenderableContentControl DataContext="{Binding PlcHammer.TECH_MAIN._app._station001._swiftModeTask}" />
                 </UniformGrid>
             </Grid>
         </TabItem>

diff --git a/JSONREPOS/ProcessSettings/default b/JSONREPOS/ProcessSettings/default
@@ -2,20 +2,200 @@
   "DimX": {
     "Mininum": 9.5,
     "Measured": 0.0,
-    "Maximum": 11.0
+    "Maximum": 8.0
   },
   "DimY": {
     "Mininum": 10.0,
     "Measured": 0.0,
-    "Maximum": 11.0
+    "Maximum": 8.0
   },
   "DimZ": {
     "Mininum": 10.5,
     "Measured": 0.0,
-    "Maximum": 11.0
+    "Maximum": 8.0
   },
   "_recordId": null,
   "Changes": [
+    {
+      "DateTime": "2021-06-29T13:46:06.0333027+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimX.Maximum"
+      },
+      "OldValue": 10.0,
+      "NewValue": 8.0
+    },
+    {
+      "DateTime": "2021-06-29T13:46:07.0398878+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimY.Maximum"
+      },
+      "OldValue": 10.5,
+      "NewValue": 8.0
+    },
+    {
+      "DateTime": "2021-06-29T13:46:08.5018957+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimZ.Maximum"
+      },
+      "OldValue": 11.0,
+      "NewValue": 8.0
+    },
+    {
+      "DateTime": "2021-06-29T13:40:08.9478915+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimX.Maximum"
+      },
+      "OldValue": 8.0,
+      "NewValue": 10.0
+    },
+    {
+      "DateTime": "2021-06-29T13:40:11.2320153+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimY.Maximum"
+      },
+      "OldValue": 4.0,
+      "NewValue": 10.5
+    },
+    {
+      "DateTime": "2021-06-29T13:40:16.0269946+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimZ.Maximum"
+      },
+      "OldValue": 4.0,
+      "NewValue": 11.0
+    },
+    {
+      "DateTime": "2021-06-29T12:27:20.0328679+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimX.Maximum"
+      },
+      "OldValue": 9.6,
+      "NewValue": 8.0
+    },
+    {
+      "DateTime": "2021-06-29T12:27:21.6145923+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimY.Maximum"
+      },
+      "OldValue": 10.1,
+      "NewValue": 4.0
+    },
+    {
+      "DateTime": "2021-06-29T12:27:23.5882911+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimZ.Maximum"
+      },
+      "OldValue": 10.6,
+      "NewValue": 4.0
+    },
+    {
+      "DateTime": "2021-06-29T12:25:51.3879575+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimX.Maximum"
+      },
+      "OldValue": 10.5,
+      "NewValue": 9.6
+    },
+    {
+      "DateTime": "2021-06-29T12:25:56.9529798+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimY.Maximum"
+      },
+      "OldValue": 10.5,
+      "NewValue": 10.1
+    },
+    {
+      "DateTime": "2021-06-29T12:26:01.394049+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimZ.Maximum"
+      },
+      "OldValue": 10.5,
+      "NewValue": 10.6
+    },
+    {
+      "DateTime": "2021-06-29T12:08:46.4299477+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimX.Maximum"
+      },
+      "OldValue": 9.55,
+      "NewValue": 10.5
+    },
+    {
+      "DateTime": "2021-06-29T12:08:47.6357054+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimY.Maximum"
+      },
+      "OldValue": 9.55,
+      "NewValue": 10.5
+    },
+    {
+      "DateTime": "2021-06-29T12:08:49.2643256+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimZ.Maximum"
+      },
+      "OldValue": 9.55,
+      "NewValue": 10.5
+    },
+    {
+      "DateTime": "2021-06-29T12:08:16.0536027+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimX.Maximum"
+      },
+      "OldValue": 11.0,
+      "NewValue": 9.55
+    },
+    {
+      "DateTime": "2021-06-29T12:08:16.6898914+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimY.Maximum"
+      },
+      "OldValue": 11.0,
+      "NewValue": 9.55
+    },
+    {
+      "DateTime": "2021-06-29T12:08:19.1502745+02:00",
+      "UserName": "no user",
+      "ValueTag": {
+        "HumanReadable": "",
+        "Symbol": "TECH_MAIN._app._station001._processRecipies._data.DimZ.Maximum"
+      },
+      "OldValue": 11.0,
+      "NewValue": 9.55
+    },
     {
       "DateTime": "2021-06-28T10:37:50.74883+02:00",
       "UserName": "no user",
@@ -109,5 +289,5 @@
   ],
   "_EntityId": "default",
   "_Created": "2021-06-28T08:49:30.0154225+02:00",
-  "_Modified": "2021-06-28T10:37:55.3603992+02:00"
+  "_Modified": "2021-06-29T13:46:09.493737+02:00"
 }
diff --git a/TcOpenHammer/TcOpenHammer/PlcHammer/LineIDs.dbg b/TcOpenHammer/TcOpenHammer/PlcHammer/LineIDs.dbg
diff --git a/TcOpenHammer/TcOpenHammer/PlcHammer/POUs/Station001/Station001.TcPOU b/TcOpenHammer/TcOpenHammer/PlcHammer/POUs/Station001/Station001.TcPOU
@@ -7,11 +7,13 @@ VAR
 	
 	_groundMode : Station001_GroundMode(THIS^, eRestoreMode.None);
 	_automatMode : Station001_AutomatMode(THIS^, eRestoreMode.None);
+	_swiftSequence   : Station001_Swift(THIS^, eRestoreMode.None);
 	
 	_groundModeTask : TcoCore.TcoTask(THIS^);
 	_automatModeTask : TcoCore.TcoTask(THIS^);
 	_serviceModeTask : TcoCore.TcoTask(THIS^);
-
+	_swiftModeTask : TcoCore.TcoTask(THIS^);
+	
 	_processRecipies : ProcessDataManager(THIS^); 
     _processTraceabilty : ProcessDataManager(THIS^);
 	_technologicalDataManager : TechnologicalDataManager(THIS^);
@@ -29,6 +31,17 @@ GroundMode();
 AutomatMode();
 
 
+IF(_swiftModeTask.Execute()) THEN
+	Messenger.Trace('Service mode active');	
+	_automatModeTask.Restore();
+	_groundModeTask.Restore();
+	_groundMode.Restore();
+	_automatMode.Restore();
+	_serviceModeTask.Restore();
+	_swiftSequence.Run();
+END_IF
+
+
 
 
 ]]></ST>