From daf4d915f4eb60ac54a6c9b2a680e8cf0b1f948a Mon Sep 17 00:00:00 2001
From: Roy <Roy.mail.net@gmail.com>
Date: Thu, 5 Jan 2023 03:50:24 +0200
Subject: Implemented TCP Firmware Client.

---
 .../Tango.MachineStudio.UI/Views/MachineConnectionView.xaml  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 78557a42e..37af16efe 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -106,6 +106,18 @@
                                         </StackPanel>
                                     </DockPanel>
                                 </DataTemplate>
+                                <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpFirmwareClient}">
+                                    <DockPanel>
+                                        <StackPanel Orientation="Horizontal">
+                                            <Image Source="/Images/external-bridge-lan.png" Height="45" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <StackPanel Margin="10 0 0 0">
+                                                <TextBlock FontSize="11">
+                                            <Run FontWeight="Bold">IP Address:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
+                                                </TextBlock>
+                                            </StackPanel>
+                                        </StackPanel>
+                                    </DockPanel>
+                                </DataTemplate>
                                 <DataTemplate DataType="{x:Type emulations:EmulatorExternalBridge}">
                                     <DockPanel>
                                         <StackPanel Orientation="Horizontal">
-- 
cgit v1.3.1


From a4cd972fd023425fa9414e56748665cb2821f412 Mon Sep 17 00:00:00 2001
From: Roy <Roy.mail.net@gmail.com>
Date: Fri, 17 Feb 2023 16:17:10 +0200
Subject: MS Eureka connections

---
 Software/Graphics/Eureka/eureka-full.png           | Bin 0 -> 1399099 bytes
 Software/Graphics/Eureka/eureka.png                | Bin 55317 -> 182972 bytes
 Software/Graphics/Eureka/machine-eureka.png        | Bin 191903 -> 0 bytes
 Software/Graphics/Eureka/tcp.png                   | Bin 0 -> 1968 bytes
 .../Controls/MachineConnectionIcon.xaml            |  43 +++++++++++++++++++--
 .../Controls/MachineConnectionIcon.xaml.cs         |  17 +++++++-
 .../Images/Connections/emulator.png                | Bin 0 -> 1131 bytes
 .../Images/Connections/eureka.png                  | Bin 0 -> 182972 bytes
 .../Images/Connections/signalr.png                 | Bin 0 -> 2739 bytes
 .../Images/Connections/tcp.png                     | Bin 0 -> 1968 bytes
 .../Images/Connections/ts1800.png                  | Bin 0 -> 43275 bytes
 .../Images/Connections/usb.png                     | Bin 0 -> 560 bytes
 .../Images/Connections/wifi.png                    | Bin 0 -> 743 bytes
 .../Tango.MachineStudio.Common.csproj              |  11 +++++-
 .../Views/MachineConnectionView.xaml               |  11 +++---
 .../ExternalBridge/ExternalBridgeScanner.cs        |   2 +-
 16 files changed, 72 insertions(+), 12 deletions(-)
 create mode 100644 Software/Graphics/Eureka/eureka-full.png
 delete mode 100644 Software/Graphics/Eureka/machine-eureka.png
 create mode 100644 Software/Graphics/Eureka/tcp.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml')

diff --git a/Software/Graphics/Eureka/eureka-full.png b/Software/Graphics/Eureka/eureka-full.png
new file mode 100644
index 000000000..0c8d452a8
Binary files /dev/null and b/Software/Graphics/Eureka/eureka-full.png differ
diff --git a/Software/Graphics/Eureka/eureka.png b/Software/Graphics/Eureka/eureka.png
index c93e262c6..1bab06fce 100644
Binary files a/Software/Graphics/Eureka/eureka.png and b/Software/Graphics/Eureka/eureka.png differ
diff --git a/Software/Graphics/Eureka/machine-eureka.png b/Software/Graphics/Eureka/machine-eureka.png
deleted file mode 100644
index ff1377a9b..000000000
Binary files a/Software/Graphics/Eureka/machine-eureka.png and /dev/null differ
diff --git a/Software/Graphics/Eureka/tcp.png b/Software/Graphics/Eureka/tcp.png
new file mode 100644
index 000000000..a19a64fec
Binary files /dev/null and b/Software/Graphics/Eureka/tcp.png differ
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
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/emulator.png differ
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
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/eureka.png differ
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
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/signalr.png differ
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
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/tcp.png differ
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
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/ts1800.png differ
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
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/usb.png differ
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
Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/wifi.png differ
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>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 37af16efe..59b9fe67f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -8,6 +8,7 @@
              xmlns:integration="clr-namespace:Tango.Integration.ExternalBridge;assembly=Tango.Integration"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:emulations="clr-namespace:Tango.Emulations.ExternalBridge;assembly=Tango.Emulations"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="400" Width="700" Height="500" Background="{StaticResource Dialog.Background}" DataContext="{Binding MachineConnectionViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}">
@@ -58,7 +59,7 @@
                                 <DataTemplate DataType="{x:Type integration:ExternalBridgeSignalRClient}">
                                     <DockPanel>
                                         <StackPanel Orientation="Horizontal">
-                                            <Image Source="/Images/external-bridge-signalr.png" Height="45" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <controls:MachineConnectionIcon ExternalBridgeClient="{Binding}" Height="45" />
                                             <StackPanel Margin="10 0 0 0">
                                                 <TextBlock FontSize="11">
                                             <Run FontWeight="Bold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run>
@@ -76,7 +77,7 @@
                                 <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
                                     <DockPanel>
                                         <StackPanel Orientation="Horizontal">
-                                            <Image Source="/Images/external-bridge-tcp.png" Height="45" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <controls:MachineConnectionIcon ExternalBridgeClient="{Binding}" Height="45" />
                                             <StackPanel Margin="10 0 0 0">
                                                 <TextBlock FontSize="11">
                                             <Run FontWeight="Bold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run>
@@ -94,7 +95,7 @@
                                 <DataTemplate DataType="{x:Type integration:ExternalBridgeUsbClient}">
                                     <DockPanel>
                                         <StackPanel Orientation="Horizontal">
-                                            <Image Source="/Images/external-bridge-usb.png" Height="45" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <controls:MachineConnectionIcon ExternalBridgeClient="{Binding}" Height="45" />
                                             <StackPanel Margin="10 0 0 0">
                                                 <TextBlock FontSize="11">
                                             <Run FontWeight="Bold">Port:</Run> <Run Text="{Binding ComPort,Mode=OneWay}"></Run>
@@ -109,7 +110,7 @@
                                 <DataTemplate DataType="{x:Type integration:ExternalBridgeTcpFirmwareClient}">
                                     <DockPanel>
                                         <StackPanel Orientation="Horizontal">
-                                            <Image Source="/Images/external-bridge-lan.png" Height="45" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <controls:MachineConnectionIcon ExternalBridgeClient="{Binding}" Height="45" />
                                             <StackPanel Margin="10 0 0 0">
                                                 <TextBlock FontSize="11">
                                             <Run FontWeight="Bold">IP Address:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
@@ -121,7 +122,7 @@
                                 <DataTemplate DataType="{x:Type emulations:EmulatorExternalBridge}">
                                     <DockPanel>
                                         <StackPanel Orientation="Horizontal">
-                                            <Image Source="/Images/external-bridge-emulator.png" Height="45" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <controls:MachineConnectionIcon ExternalBridgeClient="{Binding}" Height="45" />
                                             <StackPanel Margin="10 0 0 0">
                                                 <TextBlock FontSize="11">
                                                 <Run Text="External Bridge Emulator"></Run>
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
index a2b0d0f5b..8ffe2b86c 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
@@ -348,7 +348,7 @@ namespace Tango.Integration.ExternalBridge
 
                             if (newMachine != null)
                             {
-                                newMachine.MachineType = knownMachine.Type;
+                                newMachine.MachineType = (MachineTypes)machine.MachineType;
                                 LogManager.Log("Found a new machine via SignalR " + newMachine.SerialNumber);
 
                                 ThreadsHelper.InvokeUINow(() =>
-- 
cgit v1.3.1