From a4cd972fd023425fa9414e56748665cb2821f412 Mon Sep 17 00:00:00 2001 From: Roy Date: Fri, 17 Feb 2023 16:17:10 +0200 Subject: MS Eureka connections --- .../Controls/MachineConnectionIcon.xaml | 43 ++++++++++++++++++++-- .../Controls/MachineConnectionIcon.xaml.cs | 17 ++++++++- 2 files changed, 55 insertions(+), 5 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml index e43a30e6d..bfcf221c9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml @@ -5,9 +5,44 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Tango.MachineStudio.Common.Controls" mc:Ignorable="d" - d:DesignHeight="45" d:DesignWidth="45"> - - - + d:DesignHeight="45" d:DesignWidth="45" d:DataContext="{d:DesignInstance Type=local:MachineConnectionIcon,IsDesignTimeCreatable=False}"> + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs index 72b9af55f..6f754e306 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs @@ -32,6 +32,14 @@ namespace Tango.MachineStudio.Common.Controls /// public partial class MachineConnectionIcon : UserControl { + public MachineTypes MachineType + { + get { return (MachineTypes)GetValue(MachineTypeProperty); } + set { SetValue(MachineTypeProperty, value); } + } + public static readonly DependencyProperty MachineTypeProperty = + DependencyProperty.Register("MachineType", typeof(MachineTypes), typeof(MachineConnectionIcon), new PropertyMetadata(MachineTypes.TS1800)); + public IExternalBridgeClient ExternalBridgeClient { get { return (IExternalBridgeClient)GetValue(ExternalBridgeClientProperty); } @@ -56,13 +64,20 @@ namespace Tango.MachineStudio.Common.Controls { ExternalBridgeClientType = ExternalBridgeClientType.Usb; } - else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpClient)) + else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpFirmwareClient)) { ExternalBridgeClientType = ExternalBridgeClientType.Tcp; + MachineType = MachineTypes.Eureka; + } + else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpClient)) + { + ExternalBridgeClientType = ExternalBridgeClientType.Wifi; + MachineType = ExternalBridgeClient.MachineType; } else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeSignalRClient)) { ExternalBridgeClientType = ExternalBridgeClientType.SignalR; + MachineType = ExternalBridgeClient.MachineType; } else if (ExternalBridgeClient.GetType() == typeof(EmulatorExternalBridge)) { -- cgit v1.3.1