Machine Type Connection, Discovery Handling.

26 files changed, 335 insertions, 111 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 89eb98fa5..0c6b719f7 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 85da53042..c083d262b 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/PMR/Messages/Common/MachineType.proto b/Software/PMR/Messages/Common/MachineType.proto
new file mode 100644
index 000000000..8f80120f0
--- /dev/null
+++ b/Software/PMR/Messages/Common/MachineType.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package Tango.PMR.Common;
+option java_package = "com.twine.tango.pmr.common";
+
+enum MachineType
+{
+	TS1800 = 0;
+	Eureka = 1;
+}
diff --git a/Software/PMR/Messages/Connection/ConnectRequest.proto b/Software/PMR/Messages/Connection/ConnectRequest.proto
index 11661bc5c..a672aeb3f 100644
--- a/Software/PMR/Messages/Connection/ConnectRequest.proto
+++ b/Software/PMR/Messages/Connection/ConnectRequest.proto
@@ -1,6 +1,7 @@
 syntax = "proto3";
 
 import "JobSpoolType.proto";
+import "MachineType.proto";
 
 package Tango.PMR.Connection;
 option java_package = "com.twine.tango.pmr.connection";
@@ -10,4 +11,5 @@ message ConnectRequest
 	string Password = 1;
 	int64 UnixTime = 2;
 	PMR.Printing.JobSpoolType SpoolType = 3;
+	PMR.Common.MachineType MachineType = 4;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/Integration/ExternalBridgeUdpDiscoveryPacket.proto b/Software/PMR/Messages/Integration/ExternalBridgeUdpDiscoveryPacket.proto
index 9a65d3818..414052552 100644
--- a/Software/PMR/Messages/Integration/ExternalBridgeUdpDiscoveryPacket.proto
+++ b/Software/PMR/Messages/Integration/ExternalBridgeUdpDiscoveryPacket.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "MachineType.proto";
+
 package Tango.PMR.Integration;
 option java_package = "com.twine.tango.pmr.integration";
 
@@ -8,4 +10,5 @@ message ExternalBridgeUdpDiscoveryPacket
 	string Time = 1;
 	string SerialNumber = 2;
 	string Guid = 3;
+	PMR.Common.MachineType MachineType = 4;
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 2b3bc2a99..bef18e15b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -320,6 +320,8 @@ namespace Tango.PPC.Common.Connection
                 {
                     LogManager.Log("First machine entry found. Machine serial number is: " + Machine.SerialNumber + ".");
 
+                    MachineOperator.MachineType = Machine.Type;
+
                     if (Machine.IsDemo)
                     {
                         LogManager.Log("Machine is in demo mode. Changing firmware upgrade mode to TFP package only.");
diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
index f6a97c88e..48974eb96 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
@@ -301,5 +301,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// machine type
+        /// </summary>
+        public Int32 MachineType 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
index b82738db8..4e998bdc9 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs
@@ -90,6 +90,20 @@ namespace Tango.BL.Entities
             }
         }
 
+        [NotMapped]
+        [JsonIgnore]
+        public MachineTypes Type
+        {
+            get
+            {
+                return (MachineTypes)MachineType;
+            }
+            set
+            {
+                MachineType = value.ToInt32();
+            }
+        }
+
         #endregion
 
         protected override void RaisePropertyChanged(string propName)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
index b56e59174..dcd84d9eb 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
@@ -81,6 +81,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> VersionTagChanged;
 
+        public event EventHandler<Int32> MachineTypeChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<ColorProcessParameter>> ColorProcessParametersChanged;
@@ -1037,6 +1039,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _machinetype;
+
+        /// <summary>
+        /// Gets or sets the machinebase machine type.
+        /// </summary>
+
+        [Column("MACHINE_TYPE")]
+
+        public  Int32 MachineType
+        {
+            get 
+            {
+                return _machinetype; 
+            }
+
+            set 
+            {
+                if (_machinetype != value)
+                {
+                    _machinetype = value;
+
+                    OnMachineTypeChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
@@ -1602,6 +1631,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the MachineType has changed.
+        /// </summary>
+        protected virtual void OnMachineTypeChanged(Int32 machinetype)
+        {
+            MachineTypeChanged?.Invoke(this, machinetype);
+            RaisePropertyChanged(nameof(MachineType));
+        }
+
+        /// <summary>
         /// Called when the Cats has changed.
         /// </summary>
         protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats)
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs
new file mode 100644
index 000000000..ff5104b9b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/MachineTypes.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Enumerations
+{
+    public enum MachineTypes
+    {
+        [Description("TS-1800")]
+        TS1800 = 0,
+        [Description("Eureka")]
+        Eureka = 1,
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index d00304e0e..659565224 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -596,6 +596,7 @@
     <Compile Include="Enumerations\RmlQualifications.cs" />
     <Compile Include="Enumerations\TestResultColors.cs" />
     <Compile Include="Enumerations\TwistDirections.cs" />
+    <Compile Include="Enumerations\MachineTypes.cs" />
     <Compile Include="Enumerations\YarnUnits.cs" />
     <Compile Include="ExtensionMethods\ColorCatalogItemsExtensions.cs" />
     <Compile Include="ExtensionMethods\ColorMineExtensions.cs" />
@@ -832,7 +833,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
index 98b65c77c..415ecaf50 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
@@ -66,6 +66,7 @@ namespace Tango.DAL.Remote.DB
         public bool LIGHT_INKS_INSTALLED { get; set; }
         public bool BTSR_INSTALLED { get; set; }
         public string VERSION_TAG { get; set; }
+        public int MACHINE_TYPE { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CAT> CATS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index d28d22849..889a6ded6 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -963,6 +963,7 @@
           <Property Name="LIGHT_INKS_INSTALLED" Type="bit" Nullable="false" />
           <Property Name="BTSR_INSTALLED" Type="bit" Nullable="false" />
           <Property Name="VERSION_TAG" Type="varchar" MaxLength="50" />
+          <Property Name="MACHINE_TYPE" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="MACHINES_EVENTS">
           <Key>
@@ -6597,6 +6598,7 @@
           <Property Name="LIGHT_INKS_INSTALLED" Type="Boolean" Nullable="false" />
           <Property Name="BTSR_INSTALLED" Type="Boolean" Nullable="false" />
           <Property Name="VERSION_TAG" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="MACHINE_TYPE" Type="Int32" Nullable="false" />
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_MACHINES" FromRole="MACHINE" ToRole="CAT" />
           <NavigationProperty Name="COLOR_PROCESS_PARAMETERS" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_MACHINES" FromRole="MACHINE" ToRole="COLOR_PROCESS_PARAMETERS" />
           <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_MACHINES_CONFIGURATIONS" FromRole="MACHINE" ToRole="CONFIGURATION" />
@@ -9997,6 +9999,7 @@
           <EntitySetMapping Name="MACHINES">
             <EntityTypeMapping TypeName="RemoteModel.MACHINE">
               <MappingFragment StoreEntitySet="MACHINES">
+                <ScalarProperty Name="MACHINE_TYPE" ColumnName="MACHINE_TYPE" />
                 <ScalarProperty Name="VERSION_TAG" ColumnName="VERSION_TAG" />
                 <ScalarProperty Name="BTSR_INSTALLED" ColumnName="BTSR_INSTALLED" />
                 <ScalarProperty Name="LIGHT_INKS_INSTALLED" ColumnName="LIGHT_INKS_INSTALLED" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 88fc1b92d..1d22ffc93 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,102 +5,102 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="5.25" PointY="29.25" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="4.5" PointY="54.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="65.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="72.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="75.75" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="14" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="9.875" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="54" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="11.25" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="36.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="4.5" PointY="33.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="6.75" PointY="34" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="9" PointY="32.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="11.25" PointY="20.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="5.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="38" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="71.125" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="4.5" PointY="58.375" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="3" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="70.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="83.375" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="82.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="78.625" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="87" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="34" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="5.25" PointY="43.5" />
-        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="11.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="12.5" PointY="52.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="14.75" PointY="61.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="92.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9.75" PointY="74.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="86.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="76" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.5" PointY="79" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="11.75" PointY="59.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="11.5" PointY="83.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="13.75" PointY="70.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="12.5" PointY="78.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="14.75" PointY="65.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="68.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="82.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="66.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="56.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="36.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="14.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="28.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="9" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="24.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="14.75" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="90" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="62.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="62.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="55.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="40.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="31" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="39.375" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6.75" PointY="56.25" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="10" PointY="8.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="44.25" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="47.25" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="11.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="14" PointY="1.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="3" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="32.125" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="62.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="76.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="82.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="69.625" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="8.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="36.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="8.75" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="34" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="75.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="58.375" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="78.375" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="43.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="42.75" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="79.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="87.875" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="10.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="28.5" />
+        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="24.625" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="90.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="80.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="86.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="70.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="8.5" PointY="93.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="10.75" PointY="78.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.5" PointY="83" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8.75" PointY="67.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.5" PointY="84.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="11.75" PointY="70.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="60.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="11.75" PointY="65.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="72.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.5" PointY="62.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="8.75" PointY="64" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="39.375" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="40.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="24.875" />
+        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="13" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="36.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="66.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="49.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="33.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="40" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="7.125" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="58" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="60.25" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.125" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="11" PointY="1" />
         <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.625" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="10" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="12.25" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="10.75" PointY="24.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="7.5" PointY="29" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="37.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="11.25" PointY="32.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="25" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="10.25" PointY="28.625" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="10.875" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="42.25" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="16.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="10" PointY="49.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="16.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="16.75" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="41.5" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="12.25" PointY="46.875" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="0.75" PointY="1.5" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="6.875" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="18.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="30.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="21.125" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="13.125" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="9" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="40.375" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="18.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="45" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="20.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="20.75" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="24.875" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="26.375" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="8.75" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="12.75" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
index da55a13d3..a2b0d0f5b 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
@@ -14,6 +14,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 using Tango.Core;
 using Tango.Core.Helpers;
 using Tango.Integration.ExternalBridge.Web;
@@ -288,6 +289,7 @@ namespace Tango.Integration.ExternalBridge
 
                         if (newMachine != null)
                         {
+                            newMachine.MachineType = (MachineTypes)discoveryPacket.MachineType;
                             LogManager.Log("Found a new machine via TCP " + newMachine.SerialNumber);
 
                             ThreadsHelper.InvokeUINow(() =>
@@ -346,6 +348,7 @@ namespace Tango.Integration.ExternalBridge
 
                             if (newMachine != null)
                             {
+                                newMachine.MachineType = knownMachine.Type;
                                 LogManager.Log("Found a new machine via SignalR " + newMachine.SerialNumber);
 
                                 ThreadsHelper.InvokeUINow(() =>
@@ -429,6 +432,7 @@ namespace Tango.Integration.ExternalBridge
 
                     if (newMachine != null)
                     {
+                        newMachine.MachineType = (MachineTypes)info.MachineType;
                         LogManager.Log("Found a new machine via IP Address" + newMachine.SerialNumber);
 
                         ThreadsHelper.InvokeUINow(() =>
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
index ae7cace31..ef66275cf 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
@@ -237,10 +237,11 @@ namespace Tango.Integration.ExternalBridge
             {
                 SerialNumber = Machine.SerialNumber,
                 Guid = Machine.Guid,
+                MachineType = (PMR.Common.MachineType)Machine.MachineType
             })
             {
                 MulticastGroupAddress = _multicastAddress,
-                TcpValidationInfo = new TcpValidationInfo() { Guid = Machine.Guid, SerialNumber = Machine.SerialNumber  }
+                TcpValidationInfo = new TcpValidationInfo() { Guid = Machine.Guid, SerialNumber = Machine.SerialNumber, MachineType = Machine.MachineType }
             };
 
             _discoveryService.BeforeBroadcasting -= _discoverySevice_BeforeBroadcasting;
@@ -642,6 +643,7 @@ namespace Tango.Integration.ExternalBridge
                             {
                                 SerialNumber = Machine.SerialNumber,
                                 Organization = Machine.Organization.Name,
+                                MachineType = Machine.MachineType
                             });
 
                             _isSignalRConnected = true;
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/Web/MachineInfo.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/Web/MachineInfo.cs
index cccc24c35..5e70be977 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/Web/MachineInfo.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/Web/MachineInfo.cs
@@ -13,6 +13,7 @@ namespace Tango.Integration.ExternalBridge.Web
         public String SerialNumber { get; set; }
         public String Organization { get; set; }
         public String IPAddress { get; set; }
+        public int MachineType { get; set; }
 
         public MachineInfo()
         {
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
index ca00f2891..5db477b6b 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
@@ -26,6 +26,7 @@ using Tango.PMR.MachineStatus;
 using Tango.PMR.ThreadLoading;
 using Tango.PMR.Power;
 using Tango.PMR.IFS;
+using Tango.BL.Enumerations;
 
 namespace Tango.Integration.Operation
 {
@@ -61,6 +62,11 @@ namespace Tango.Integration.Operation
         MachineStatuses Status { get; }
 
         /// <summary>
+        /// Gets or sets the type of the machine.
+        /// </summary>
+        MachineTypes MachineType { get; set; }
+
+        /// <summary>
         /// Gets a value indicating whether the machine is connected and status is not disconnected.
         /// </summary>
         bool IsConnected { get; }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 005121b88..9c94363df 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -664,6 +664,11 @@ namespace Tango.Integration.Operation
         /// </summary>
         public bool IsSpoolReplaced { get; private set; }
 
+        /// <summary>
+        /// Gets or sets the type of the machine.
+        /// </summary>
+        public MachineTypes MachineType { get; set; }
+
         #endregion
 
         #region Virtual Methods
@@ -1499,7 +1504,8 @@ namespace Tango.Integration.Operation
                 {
                     Password = "1234",
                     UnixTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
-                    SpoolType = _currentSpoolType
+                    SpoolType = _currentSpoolType,
+                    MachineType = (PMR.Common.MachineType)MachineType,
                 };
 
                 try
diff --git a/Software/Visual_Studio/Tango.PMR/Common/MachineType.cs b/Software/Visual_Studio/Tango.PMR/Common/MachineType.cs
new file mode 100644
index 000000000..4ef97d168
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Common/MachineType.cs
@@ -0,0 +1,45 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: MachineType.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.Common {
+
+  /// <summary>Holder for reflection information generated from MachineType.proto</summary>
+  public static partial class MachineTypeReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for MachineType.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static MachineTypeReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChFNYWNoaW5lVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiolCgtNYWNo",
+            "aW5lVHlwZRIKCgZUUzE4MDAQABIKCgZFdXJla2EQAUIcChpjb20udHdpbmUu",
+            "dGFuZ28ucG1yLmNvbW1vbmIGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MachineType), }, null));
+    }
+    #endregion
+
+  }
+  #region Enums
+  public enum MachineType {
+    [pbr::OriginalName("TS1800")] Ts1800 = 0,
+    [pbr::OriginalName("Eureka")] Eureka = 1,
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Connection/ConnectRequest.cs b/Software/Visual_Studio/Tango.PMR/Connection/ConnectRequest.cs
index 0edef7665..d62d5dbc5 100644
--- a/Software/Visual_Studio/Tango.PMR/Connection/ConnectRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/Connection/ConnectRequest.cs
@@ -23,14 +23,16 @@ namespace Tango.PMR.Connection {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChRDb25uZWN0UmVxdWVzdC5wcm90bxIUVGFuZ28uUE1SLkNvbm5lY3Rpb24a",
-            "EkpvYlNwb29sVHlwZS5wcm90byJpCg5Db25uZWN0UmVxdWVzdBIQCghQYXNz",
-            "d29yZBgBIAEoCRIQCghVbml4VGltZRgCIAEoAxIzCglTcG9vbFR5cGUYAyAB",
-            "KA4yIC5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU3Bvb2xUeXBlQiAKHmNvbS50",
-            "d2luZS50YW5nby5wbXIuY29ubmVjdGlvbmIGcHJvdG8z"));
+            "EkpvYlNwb29sVHlwZS5wcm90bxoRTWFjaGluZVR5cGUucHJvdG8inQEKDkNv",
+            "bm5lY3RSZXF1ZXN0EhAKCFBhc3N3b3JkGAEgASgJEhAKCFVuaXhUaW1lGAIg",
+            "ASgDEjMKCVNwb29sVHlwZRgDIAEoDjIgLlRhbmdvLlBNUi5QcmludGluZy5K",
+            "b2JTcG9vbFR5cGUSMgoLTWFjaGluZVR5cGUYBCABKA4yHS5UYW5nby5QTVIu",
+            "Q29tbW9uLk1hY2hpbmVUeXBlQiAKHmNvbS50d2luZS50YW5nby5wbXIuY29u",
+            "bmVjdGlvbmIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, global::Tango.PMR.Common.MachineTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Connection.ConnectRequest), global::Tango.PMR.Connection.ConnectRequest.Parser, new[]{ "Password", "UnixTime", "SpoolType" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Connection.ConnectRequest), global::Tango.PMR.Connection.ConnectRequest.Parser, new[]{ "Password", "UnixTime", "SpoolType", "MachineType" }, null, null, null)
           }));
     }
     #endregion
@@ -64,6 +66,7 @@ namespace Tango.PMR.Connection {
       password_ = other.password_;
       unixTime_ = other.unixTime_;
       spoolType_ = other.spoolType_;
+      machineType_ = other.machineType_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -104,6 +107,17 @@ namespace Tango.PMR.Connection {
       }
     }
 
+    /// <summary>Field number for the "MachineType" field.</summary>
+    public const int MachineTypeFieldNumber = 4;
+    private global::Tango.PMR.Common.MachineType machineType_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.Common.MachineType MachineType {
+      get { return machineType_; }
+      set {
+        machineType_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ConnectRequest);
@@ -120,6 +134,7 @@ namespace Tango.PMR.Connection {
       if (Password != other.Password) return false;
       if (UnixTime != other.UnixTime) return false;
       if (SpoolType != other.SpoolType) return false;
+      if (MachineType != other.MachineType) return false;
       return true;
     }
 
@@ -129,6 +144,7 @@ namespace Tango.PMR.Connection {
       if (Password.Length != 0) hash ^= Password.GetHashCode();
       if (UnixTime != 0L) hash ^= UnixTime.GetHashCode();
       if (SpoolType != 0) hash ^= SpoolType.GetHashCode();
+      if (MachineType != 0) hash ^= MachineType.GetHashCode();
       return hash;
     }
 
@@ -151,6 +167,10 @@ namespace Tango.PMR.Connection {
         output.WriteRawTag(24);
         output.WriteEnum((int) SpoolType);
       }
+      if (MachineType != 0) {
+        output.WriteRawTag(32);
+        output.WriteEnum((int) MachineType);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -165,6 +185,9 @@ namespace Tango.PMR.Connection {
       if (SpoolType != 0) {
         size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpoolType);
       }
+      if (MachineType != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) MachineType);
+      }
       return size;
     }
 
@@ -182,6 +205,9 @@ namespace Tango.PMR.Connection {
       if (other.SpoolType != 0) {
         SpoolType = other.SpoolType;
       }
+      if (other.MachineType != 0) {
+        MachineType = other.MachineType;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -204,6 +230,10 @@ namespace Tango.PMR.Connection {
             spoolType_ = (global::Tango.PMR.Printing.JobSpoolType) input.ReadEnum();
             break;
           }
+          case 32: {
+            machineType_ = (global::Tango.PMR.Common.MachineType) input.ReadEnum();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeUdpDiscoveryPacket.cs b/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeUdpDiscoveryPacket.cs
index 309f95be3..21563b570 100644
--- a/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeUdpDiscoveryPacket.cs
+++ b/Software/Visual_Studio/Tango.PMR/Integration/ExternalBridgeUdpDiscoveryPacket.cs
@@ -23,14 +23,15 @@ namespace Tango.PMR.Integration {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CiZFeHRlcm5hbEJyaWRnZVVkcERpc2NvdmVyeVBhY2tldC5wcm90bxIVVGFu",
-            "Z28uUE1SLkludGVncmF0aW9uIlQKIEV4dGVybmFsQnJpZGdlVWRwRGlzY292",
-            "ZXJ5UGFja2V0EgwKBFRpbWUYASABKAkSFAoMU2VyaWFsTnVtYmVyGAIgASgJ",
-            "EgwKBEd1aWQYAyABKAlCIQofY29tLnR3aW5lLnRhbmdvLnBtci5pbnRlZ3Jh",
-            "dGlvbmIGcHJvdG8z"));
+            "Z28uUE1SLkludGVncmF0aW9uGhFNYWNoaW5lVHlwZS5wcm90byKIAQogRXh0",
+            "ZXJuYWxCcmlkZ2VVZHBEaXNjb3ZlcnlQYWNrZXQSDAoEVGltZRgBIAEoCRIU",
+            "CgxTZXJpYWxOdW1iZXIYAiABKAkSDAoER3VpZBgDIAEoCRIyCgtNYWNoaW5l",
+            "VHlwZRgEIAEoDjIdLlRhbmdvLlBNUi5Db21tb24uTWFjaGluZVR5cGVCIQof",
+            "Y29tLnR3aW5lLnRhbmdvLnBtci5pbnRlZ3JhdGlvbmIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
+          new pbr::FileDescriptor[] { global::Tango.PMR.Common.MachineTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ExternalBridgeUdpDiscoveryPacket), global::Tango.PMR.Integration.ExternalBridgeUdpDiscoveryPacket.Parser, new[]{ "Time", "SerialNumber", "Guid" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Integration.ExternalBridgeUdpDiscoveryPacket), global::Tango.PMR.Integration.ExternalBridgeUdpDiscoveryPacket.Parser, new[]{ "Time", "SerialNumber", "Guid", "MachineType" }, null, null, null)
           }));
     }
     #endregion
@@ -64,6 +65,7 @@ namespace Tango.PMR.Integration {
       time_ = other.time_;
       serialNumber_ = other.serialNumber_;
       guid_ = other.guid_;
+      machineType_ = other.machineType_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -104,6 +106,17 @@ namespace Tango.PMR.Integration {
       }
     }
 
+    /// <summary>Field number for the "MachineType" field.</summary>
+    public const int MachineTypeFieldNumber = 4;
+    private global::Tango.PMR.Common.MachineType machineType_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.Common.MachineType MachineType {
+      get { return machineType_; }
+      set {
+        machineType_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ExternalBridgeUdpDiscoveryPacket);
@@ -120,6 +133,7 @@ namespace Tango.PMR.Integration {
       if (Time != other.Time) return false;
       if (SerialNumber != other.SerialNumber) return false;
       if (Guid != other.Guid) return false;
+      if (MachineType != other.MachineType) return false;
       return true;
     }
 
@@ -129,6 +143,7 @@ namespace Tango.PMR.Integration {
       if (Time.Length != 0) hash ^= Time.GetHashCode();
       if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode();
       if (Guid.Length != 0) hash ^= Guid.GetHashCode();
+      if (MachineType != 0) hash ^= MachineType.GetHashCode();
       return hash;
     }
 
@@ -151,6 +166,10 @@ namespace Tango.PMR.Integration {
         output.WriteRawTag(26);
         output.WriteString(Guid);
       }
+      if (MachineType != 0) {
+        output.WriteRawTag(32);
+        output.WriteEnum((int) MachineType);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -165,6 +184,9 @@ namespace Tango.PMR.Integration {
       if (Guid.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Guid);
       }
+      if (MachineType != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) MachineType);
+      }
       return size;
     }
 
@@ -182,6 +204,9 @@ namespace Tango.PMR.Integration {
       if (other.Guid.Length != 0) {
         Guid = other.Guid;
       }
+      if (other.MachineType != 0) {
+        MachineType = other.MachineType;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -204,6 +229,10 @@ namespace Tango.PMR.Integration {
             Guid = input.ReadString();
             break;
           }
+          case 32: {
+            machineType_ = (global::Tango.PMR.Common.MachineType) input.ReadEnum();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 50c0966c3..9490c118b 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -79,6 +79,7 @@
     <Compile Include="ColorLab\RecommendedProcessTableInput.cs" />
     <Compile Include="ColorLab\RecommendedProcessTableOutput.cs" />
     <Compile Include="Common\ErrorResponse.cs" />
+    <Compile Include="Common\MachineType.cs" />
     <Compile Include="Connection\ConnectRequest.cs" />
     <Compile Include="Connection\ConnectResponse.cs" />
     <Compile Include="Connection\DeviceInformation.cs" />
@@ -516,7 +517,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
index 4ff9dcbd2..f260ea416 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
index b2fe8b33f..fae15d85e 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
diff --git a/Software/Visual_Studio/Tango.Transport/Discovery/TcpValidationInfo.cs b/Software/Visual_Studio/Tango.Transport/Discovery/TcpValidationInfo.cs
index 8dd3aedf0..70559ebd4 100644
--- a/Software/Visual_Studio/Tango.Transport/Discovery/TcpValidationInfo.cs
+++ b/Software/Visual_Studio/Tango.Transport/Discovery/TcpValidationInfo.cs
@@ -10,5 +10,6 @@ namespace Tango.Transport.Discovery
     {
         public String SerialNumber { get; set; }
         public String Guid { get; set; }
+        public int MachineType { get; set; }
     }
 }