diff --git a/ads-wrapper/AdsManager.csproj b/ads-wrapper/AdsManager.csproj index b03c255..c271c8e 100644 --- a/ads-wrapper/AdsManager.csproj +++ b/ads-wrapper/AdsManager.csproj @@ -4,15 +4,16 @@ net8.0 enable enable - True + False Ads Manager M.Heisig Heisig GmbH Wrapper für den Ads Client von Beckhoff um automatische reconnects und onlinechanges zu behandeln. README.md - C:\Users\matthias.heisig\Documents\nuget_packages + C:\Users\C.Bliestle\Documents\0010_Obducat\WPF_HMI_Infineon\packages https://gitlab.cmblu.de/matthias.heisig/ads-wrapper 1.0.0.7 + x64 diff --git a/ads-wrapper/AdsManager.sln b/ads-wrapper/AdsManager.sln index de2b583..d0ff34c 100644 --- a/ads-wrapper/AdsManager.sln +++ b/ads-wrapper/AdsManager.sln @@ -1,20 +1,20 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34525.116 +# Visual Studio Version 18 +VisualStudioVersion = 18.2.11415.280 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdsManager", "AdsManager.csproj", "{4B80F068-4E6D-4D2D-831B-8150970600C7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4B80F068-4E6D-4D2D-831B-8150970600C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B80F068-4E6D-4D2D-831B-8150970600C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B80F068-4E6D-4D2D-831B-8150970600C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B80F068-4E6D-4D2D-831B-8150970600C7}.Release|Any CPU.Build.0 = Release|Any CPU + {4B80F068-4E6D-4D2D-831B-8150970600C7}.Debug|x64.ActiveCfg = Debug|x64 + {4B80F068-4E6D-4D2D-831B-8150970600C7}.Debug|x64.Build.0 = Debug|x64 + {4B80F068-4E6D-4D2D-831B-8150970600C7}.Release|x64.ActiveCfg = Release|x64 + {4B80F068-4E6D-4D2D-831B-8150970600C7}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/uniper_hmi/Uniper.sln b/uniper_hmi/Uniper.sln index 90d9631..a2ac41a 100644 --- a/uniper_hmi/Uniper.sln +++ b/uniper_hmi/Uniper.sln @@ -1,20 +1,20 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34408.163 +# Visual Studio Version 18 +VisualStudioVersion = 18.2.11415.280 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UniperHMI", "UniperHMI\UniperHMI.csproj", "{8D725B27-1242-4C66-ACD8-45F02098C7D3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8D725B27-1242-4C66-ACD8-45F02098C7D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D725B27-1242-4C66-ACD8-45F02098C7D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D725B27-1242-4C66-ACD8-45F02098C7D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D725B27-1242-4C66-ACD8-45F02098C7D3}.Release|Any CPU.Build.0 = Release|Any CPU + {8D725B27-1242-4C66-ACD8-45F02098C7D3}.Debug|x64.ActiveCfg = Debug|x64 + {8D725B27-1242-4C66-ACD8-45F02098C7D3}.Debug|x64.Build.0 = Debug|x64 + {8D725B27-1242-4C66-ACD8-45F02098C7D3}.Release|x64.ActiveCfg = Release|x64 + {8D725B27-1242-4C66-ACD8-45F02098C7D3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/uniper_hmi/UniperHMI/3rdParty/AdsManager.dll b/uniper_hmi/UniperHMI/3rdParty/AdsManager.dll new file mode 100644 index 0000000..35826ee Binary files /dev/null and b/uniper_hmi/UniperHMI/3rdParty/AdsManager.dll differ diff --git a/uniper_hmi/UniperHMI/MainWindow.xaml b/uniper_hmi/UniperHMI/MainWindow.xaml index e8d2872..e2e4dc8 100644 --- a/uniper_hmi/UniperHMI/MainWindow.xaml +++ b/uniper_hmi/UniperHMI/MainWindow.xaml @@ -9,7 +9,7 @@ x:Name="MainControlWindow" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}" WindowStartupLocation="CenterScreen" - Title="Uniper HMI" Height="800" Width="1024" ResizeMode="NoResize"> + Title="Uniper HMI" Height="1030" Width="1900" ResizeMode="NoResize"> @@ -45,41 +45,53 @@ + + + + -