Scaffolding TcoDrivesBeckhoff

TcOpen.build.slnf

@@ -5,22 +5,27 @@
       "src\\Tc.Prober\\src\\Tc.Prober\\Tc.Prober.csproj",
       "src\\Tc.Prober\\tests\\PlcTcProberTestsConnector\\PlcTcProberTestsConnector.csproj",
       "src\\Tc.Prober\\tests\\Tc.ProberTest\\Tc.ProberTest.csproj",
-      "src\\Tc.Prober\\tests\\TcProber\\TcProber.tsproj",    
+      "src\\Tc.Prober\\tests\\TcProber\\TcProber.tsproj",
       "src\\TcoCore\\src\\TcoCore.Wpf\\TcoCore.Wpf.csproj",
       "src\\TcoCore\\src\\TcoCoreConnector\\TcoCoreConnector.csproj",
       "src\\TcoCore\\src\\XaeTcoCore\\XaeTcoCore.tsproj",
       "src\\TcoCore\\tests\\TcoCore.Sandbox.Wpf\\TcoCore.Sandbox.Wpf.csproj",
       "src\\TcoCore\\tests\\TcoCoreTestsConnector\\TcoCoreTestsConnector.csproj",
       "src\\TcoCore\\tests\\TcoCoreUnitTests\\TcoCoreUnitTests.csproj",
       "src\\TcoCore\\tests\\TcoTestRunners\\TcoTestRunners.csproj",
+      "src\\TcoDrivesBeckhoff\\src\\TcoDrivesBeckhoff.Wpf\\TcoDrivesBeckhoff.Wpf.csproj",
+      "src\\TcoDrivesBeckhoff\\src\\TcoDrivesBeckhoffConnector\\TcoDrivesBeckhoffConnector.csproj",
+      "src\\TcoDrivesBeckhoff\\src\\XaeTcoDrivesBeckhoff\\XaeTcoDrivesBeckhoff.tsproj",
+      "src\\TcoDrivesBeckhoff\\tests\\TcoDrivesBeckhoffTestsConnector\\TcoDrivesBeckhoffTestsConnector.csproj",
+      "src\\TcoDrivesBeckhoff\\tests\\TcoDrivesBeckhoffUnitTests\\TcoDrivesBeckhoffUnitTests.csproj",
       "src\\TcoIoBeckhoff\\src\\TcoIoBeckhoff.Wpf\\TcoIoBeckhoff.Wpf.csproj",
       "src\\TcoIoBeckhoff\\src\\TcoIoBeckhoffConnector\\TcoIoBeckhoffConnector.csproj",
       "src\\TcoIoBeckhoff\\src\\XaeTcoIoBeckhoff\\XaeTcoIoBeckhoff.tsproj",
       "src\\TcoPneumatics\\src\\TcoPneumatics.Wpf\\TcoPneumatics.Wpf.csproj",
       "src\\TcoPneumatics\\src\\TcoPneumaticsConnector\\TcoPneumaticsConnector.csproj",
-      "src\\TcoPneumatics\\src\\XaeTcoPneumatics\\XaeTcoPneumatics.tsproj",      
+      "src\\TcoPneumatics\\src\\XaeTcoPneumatics\\XaeTcoPneumatics.tsproj",
       "src\\TcoPneumatics\\tests\\TcoPneumaticsTestsConnector\\TcoPneumaticsTestsConnector.csproj",
-      "src\\TcoPneumatics\\tests\\TcoPneumaticsTests_nUnit\\TcoPneumaticsTests_nUnit.csproj"      
+      "src\\TcoPneumatics\\tests\\TcoPneumaticsTests_nUnit\\TcoPneumaticsTests_nUnit.csproj"
     ]
   }
 }

TcOpen.plc.slnf

@@ -1,11 +1,12 @@
 {
   "solution": {
     "path": "TcOpen.sln",
-    "projects": [   
+    "projects": [
       "src\\Tc.Prober\\tests\\TcProber\\TcProber.tsproj",
-      "src\\TcoCore\\src\\XaeTcoCore\\XaeTcoCore.tsproj",      
-      "src\\TcoIoBeckhoff\\src\\XaeTcoIoBeckhoff\\XaeTcoIoBeckhoff.tsproj",      
-      "src\\TcoPneumatics\\src\\XaeTcoPneumatics\\XaeTcoPneumatics.tsproj"      
+      "src\\TcoCore\\src\\XaeTcoCore\\XaeTcoCore.tsproj",
+      "src\\TcoDrivesBeckhoff\\src\\XaeTcoDrivesBeckhoff\\XaeTcoDrivesBeckhoff.tsproj",
+      "src\\TcoIoBeckhoff\\src\\XaeTcoIoBeckhoff\\XaeTcoIoBeckhoff.tsproj",
+      "src\\TcoPneumatics\\src\\XaeTcoPneumatics\\XaeTcoPneumatics.tsproj"
     ]
   }
 }

pipelines/build.ps1

@@ -113,6 +113,7 @@ task BuildWithInxtonBuilder -depends OpenVisualStudio {
   $projects = @(  
      "src\Tc.Prober\Tc.Prober.slnf",   
      "src\TcoCore\TcoCore.slnf",
+     "src\TcoDrivesBeckhoff\TcoDrivesBeckhoff.slnf",
      "src\TcoIoBeckhoff\TcoIoBeckhoff.slnf",
      "src\TcoPneumatics\TcoPneumatics.slnf"
      "src\TcoApplicationExamples\TcoApplicationExamples.slnf"
@@ -162,6 +163,7 @@ task Tests -depends CloseVs  -precondition { return $isTestingEnabled } {
 
     $testProjects = @(                    
                       [System.Tuple]::Create(".\src\TcoCore\TcoCore.slnf", "\src\TcoCore\src\XaeTcoCore\", -1, "TcoCore"),
+                      [System.Tuple]::Create(".\src\TcoDrivesBeckhoff\TcoDrivesBeckhoff.slnf", "\src\TcoDrivesBeckhoff\src\XaeTcoDrivesBeckhoff\", -1, "TcoDrivesBeckhoff"),
                       [System.Tuple]::Create(".\src\TcoIoBeckhoff\TcoIoBeckhoff.slnf", "\src\TcoIoBeckhoff\src\XaeTcoIoBeckhoff\", -1, "TcoIoBeckhoff"),
                       [System.Tuple]::Create(".\src\TcoPneumatics\TcoPneumatics.slnf", "src\TcoPneumatics\src\XaeTcoPneumatics\", -1, "TcoPneumatics")                     
                     )
@@ -230,6 +232,8 @@ task CreatePackages -depends ClearPackages {
     #Packaging
     "src\TcoCore\src\TcoCore.Wpf\TcoCore.Wpf.csproj",
     "src\TcoCore\src\TcoCoreConnector\TcoCoreConnector.csproj",
+    "src\TcoDrivesBeckhoff\src\TcoDrivesBeckhoff.Wpf\TcoDrivesBeckhoff.Wpf.csproj",
+    "src\TcoDrivesBeckhoff\src\TcoDrivesBeckhoffConnector\TcoDrivesBeckhoffConnector.csproj",
     "src\TcoIoBeckhoff\src\TcoIoBeckhoff.Wpf\TcoIoBeckhoff.Wpf.csproj",
     "src\TcoIoBeckhoff\src\TcoIoBeckhoffConnector\TcoIoBeckhoffConnector.csproj",
     "src\TcoPneumatics\src\TcoPneumatics.Wpf\TcoPneumatics.Wpf.csproj",

src/TcoApplicationExamples/XaeAppExamples/PlcAppExamples/POUs/Tutorial/MAIN_PRG.TcPOU

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
+  <POU Name="MAIN_PRG" Id="{cb90af5d-f0ec-4337-9183-9e58e9e11014}" SpecialFunc="None">
+    <Declaration><![CDATA[PROGRAM MAIN_PRG
+VAR
+	_pneuMan : ST_01_Context;
+	_donCorleone : VitoCorleone_Context;
+	_Jack_Woltz	:	Woltz_Object(_Jack_Woltz);
+	_TcOpenTutorial : TcOpenTutorial;
+END_VAR
+]]></Declaration>
+    <Implementation>
+      <ST><![CDATA[_pneuMan.Run();
+_donCorleone.Run();
+_TcOpenTutorial.Run();]]></ST>
+    </Implementation>
+  </POU>
+</TcPlcObject>

src/TcoApplicationExamples/XaeAppExamples/PlcAppExamples/PlcAppExamples.plcproj

@@ -48,9 +48,6 @@
     <Compile Include="POUs\Context\VitoCorleone_Context.TcPOU">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="POUs\MAIN_PRG.TcPOU">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="POUs\Object\Horse_Object.TcPOU">
       <SubType>Code</SubType>
     </Compile>
@@ -136,6 +133,9 @@
     <Compile Include="POUs\Tutorial\401\POUs\Station001_Sequencer.TcPOU">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="POUs\Tutorial\MAIN_PRG.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="POUs\Tutorial\TcOpenTutorial.TcPOU">
       <SubType>Code</SubType>
     </Compile>

src/TcoCore/src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoComponent/ITcoComponent.TcIO

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
+  <Itf Name="ITcoComponent" Id="{ad6fdf47-e58a-0ffd-120f-617d765bd842}">
+    <Declaration><![CDATA[INTERFACE ITcoComponent EXTENDS ITcoObject,ITcoRestorable, ITcoServiceable
+]]></Declaration>
+  </Itf>
+</TcPlcObject>

src/TcoCore/src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoComponent/TcoComponent.TcPOU

@@ -8,7 +8,7 @@
 		</summary>				
 	</docu>	
 ~*)
-FUNCTION_BLOCK ABSTRACT TcoComponent EXTENDS TcoObject IMPLEMENTS ITcoObject,ITcoRestorable, ITcoServiceable
+FUNCTION_BLOCK ABSTRACT TcoComponent EXTENDS TcoObject IMPLEMENTS ITcoComponent
 VAR
 	{attribute 'hide'}
 	_serviceContexCycle : ULINT;	

src/TcoCore/src/XaeTcoCore/TcoCore/TcoCore.plcproj

@@ -36,6 +36,9 @@
       <SubType>Code</SubType>
       <ExcludeFromBuild>false</ExcludeFromBuild>
     </Compile>
+    <Compile Include="POUs\Prototypes\TcoComponent\ITcoComponent.TcIO">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="POUs\Prototypes\TcoComponent\TcoComponent.TcPOU">
       <SubType>Code</SubType>
     </Compile>

src/TcoDrivesBeckhoff/TcoDrivesBeckhoff.slnf

@@ -0,0 +1,13 @@
+{
+  "solution": {
+    "path": "..\\..\\TcOpen.sln",
+    "projects": [
+      "src\\TcoDrivesBeckhoff\\src\\TcoDrivesBeckhoff.Wpf\\TcoDrivesBeckhoff.Wpf.csproj",
+      "src\\TcoDrivesBeckhoff\\src\\TcoDrivesBeckhoffConnector\\TcoDrivesBeckhoffConnector.csproj",
+      "src\\TcoDrivesBeckhoff\\src\\XaeTcoDrivesBeckhoff\\XaeTcoDrivesBeckhoff.tsproj",
+      "src\\TcoDrivesBeckhoff\\tests\\TcoDrivesBeckhoff.Wpf.Sandbox\\TcoDrivesBeckhoff.Wpf.Sandbox.csproj",
+      "src\\TcoDrivesBeckhoff\\tests\\TcoDrivesBeckhoffTestsConnector\\TcoDrivesBeckhoffTestsConnector.csproj",
+      "src\\TcoDrivesBeckhoff\\tests\\TcoDrivesBeckhoffUnitTests\\TcoDrivesBeckhoffUnitTests.csproj"
+    ]
+  }
+}

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/App.xaml

@@ -0,0 +1,9 @@
+<Application x:Class="TcoDrivesBeckhoff.Wpf.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:TcoDrivesBeckhoff.Wpf"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+
+    </Application.Resources>
+</Application>

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/App.xaml.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace TcoDrivesBeckhoff.Wpf
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/MainWindow.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="TcoDrivesBeckhoff.Wpf.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TcoDrivesBeckhoff.Wpf"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800">
+    <Grid>
+
+    </Grid>
+</Window>

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/MainWindow.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace TcoDrivesBeckhoff.Wpf
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoDrivesBeckhoff.Wpf.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="1.10.0-nightly.436" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\TcoCore\src\TcoCore.Wpf\TcoCore.Wpf.csproj" />
+    <ProjectReference Include="..\TcoDrivesBeckhoffConnector\TcoDrivesBeckhoffConnector.csproj" />
+  </ItemGroup>
+
+</Project>

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoffConnector/Entry.cs

@@ -0,0 +1,14 @@
+using System;
+using Vortex.Adapters.Connector.Tc3.Adapter;
+
+namespace TcoDrivesBeckhoff
+{
+    public class Entry
+    {
+        static string amsId = Environment.GetEnvironmentVariable("Tc3Target");
+        const int amsPort = 851;
+
+        public static TcoDrivesBeckhoff.TcoDrivesBeckhoffTwinController TcoDrivesBeckhoff { get; }
+            = new TcoDrivesBeckhoff.TcoDrivesBeckhoffTwinController(Vortex.Adapters.Connector.Tc3.Adapter.Tc3ConnectorAdapter.Create(amsId, amsPort, true));
+    }
+}

src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoffConnector/Properties/AssemblyInfo.cs

@@ -0,0 +1,22 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// In SDK-style projects such as this one, several assembly attributes that were historically
+// defined in this file are now automatically added during build and populated with
+// values defined in project properties. For details of which attributes are included
+// and how to customise this process see: https://aka.ms/assembly-info-properties
+
+
+// Setting ComVisible to false makes the types in this assembly not visible to COM
+// components.  If you need to access a type in this assembly from COM, set the ComVisible
+// attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM.
+
+[assembly: Guid("492d93ed-1fd5-4398-b8b2-a9d32496a030")]
+
+[assembly: AssemblyVersion("0.4.0.217")]
+[assembly: AssemblyFileVersion("0.4.0.217")]
+[assembly: AssemblyInformationalVersion("0.4.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]