MS Eureka connections

10 files changed, 65 insertions, 6 deletions

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">
-    <Grid>
-        <Image Margin="0 5 5 0" Source="../Images/machine_new_small.png" RenderOptions.BitmapScalingMode="Fant"></Image>    
-        
+             d:DesignHeight="45" d:DesignWidth="45" d:DataContext="{d:DesignInstance Type=local:MachineConnectionIcon,IsDesignTimeCreatable=False}">
+    <Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
+        <Image Margin="0 5 5 0" RenderOptions.BitmapScalingMode="Fant">
+            <Image.Style>
+                <Style TargetType="Image">
+                    <Setter Property="Source" Value="../Images/Connections/ts1800.png"></Setter>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding MachineType}" Value="Eureka">
+                            <Setter Property="Source" Value="../Images/Connections/eureka.png"></Setter>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Image.Style>
+        </Image>
+
+        <Image RenderOptions.BitmapScalingMode="Fant" Width="20" VerticalAlignment="Top" HorizontalAlignment="Right">
+            <Image.Style>
+                <Style TargetType="Image">
+                    <Setter Property="Source" Value="../Images/Connections/usb.png"></Setter>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding ExternalBridgeClientType}" Value="Usb">
+                            <Setter Property="Source" Value="../Images/Connections/usb.png"></Setter>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding ExternalBridgeClientType}" Value="Tcp">
+                            <Setter Property="Source" Value="../Images/Connections/tcp.png"></Setter>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding ExternalBridgeClientType}" Value="Wifi">
+                            <Setter Property="Source" Value="../Images/Connections/wifi.png"></Setter>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding ExternalBridgeClientType}" Value="SignalR">
+                            <Setter Property="Source" Value="../Images/Connections/signalr.png"></Setter>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding ExternalBridgeClientType}" Value="Emulator">
+                            <Setter Property="Source" Value="../Images/Connections/emulator.png"></Setter>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Image.Style>
+        </Image>
     </Grid>
 </UserControl>
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
     /// </summary>
     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))
                 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png
new file mode 100644
index 000000000..cd3478ab2
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png
new file mode 100644
index 000000000..1bab06fce
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png
new file mode 100644
index 000000000..20d329640
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png
new file mode 100644
index 000000000..a19a64fec
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png
new file mode 100644
index 000000000..116e1e9c7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png
new file mode 100644
index 000000000..d0b917b44
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png
new file mode 100644
index 000000000..8c4bfebc4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 345c5f627..91a8b5930 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -439,10 +439,19 @@
   <ItemGroup>
     <Resource Include="Images\machine_new_small.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Connections\usb.png" />
+    <Resource Include="Images\Connections\emulator.png" />
+    <Resource Include="Images\Connections\eureka.png" />
+    <Resource Include="Images\Connections\signalr.png" />
+    <Resource Include="Images\Connections\tcp.png" />
+    <Resource Include="Images\Connections\ts1800.png" />
+    <Resource Include="Images\Connections\wifi.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>