Machine Type Connection, Discovery Handling.

5 files changed, 79 insertions, 1 deletions

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