Added new motor parameters.

Added better LAB/RGB support on colorlab module.

14 files changed, 964 insertions, 94 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
index 94fa36e57..2fe47bfab 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
@@ -342,12 +342,14 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                     input.InputCoordinates.Red = (int)SourceColor.Red;
                     input.InputCoordinates.Green = (int)SourceColor.Green;
                     input.InputCoordinates.Blue = (int)SourceColor.Blue;
+
                     input.InputCoordinates.L = SourceColor.L;
                     input.InputCoordinates.A = SourceColor.A;
                     input.InputCoordinates.B = SourceColor.B;
-                    input.ThreadL = 92.1815; //SelectedRML.MediaColor.L;
-                    input.ThreadA = 2.2555; //SelectedRML.MediaColor.A;
-                    input.ThreadB = -10.9325; //SelectedRML.MediaColor.B;
+
+                    input.ThreadL = SelectedRML.WhitePointL;
+                    input.ThreadA = SelectedRML.WhitePointA;
+                    input.ThreadB = SelectedRML.WhitePointB;
 
                     //Validate calibration data
                     foreach (var vm in LiquidsCalibrationData.Where(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor.ToInt32()))
@@ -551,9 +553,9 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 input.ForwardData = ByteString.CopyFrom(CCT.Data);
 
                 input.InputCoordinates = new InputCoordinates();
-                input.ThreadL = 92.1815; //SelectedRML.MediaColor.L;
-                input.ThreadA = 2.2555; //SelectedRML.MediaColor.A;
-                input.ThreadB = -10.9325; //SelectedRML.MediaColor.B;
+                input.ThreadL = SelectedRML.WhitePointL;
+                input.ThreadA = SelectedRML.WhitePointA;
+                input.ThreadB = SelectedRML.WhitePointB;
 
                 foreach (var vm in LiquidsCalibrationData)
                 {
@@ -585,12 +587,25 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
                 var output = converter.Convert(input);
 
-                TargetColor = new RgbVM()
+                if (SourceColor.IsLab)
+                {
+                    TargetColor = new RgbVM()
+                    {
+                        IsLab = true,
+                        L = output.SingleCoordinates.L,
+                        A = output.SingleCoordinates.A,
+                        B = output.SingleCoordinates.B,
+                    };
+                }
+                else
                 {
-                    Red = output.SingleCoordinates.Red,
-                    Green = output.SingleCoordinates.Green,
-                    Blue = output.SingleCoordinates.Blue,
-                };
+                    TargetColor = new RgbVM()
+                    {
+                        Red = output.SingleCoordinates.Red,
+                        Green = output.SingleCoordinates.Green,
+                        Blue = output.SingleCoordinates.Blue,
+                    };
+                }
             }
             catch (Exception ex)
             {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
index 888945579..381aff542 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
@@ -265,8 +265,8 @@
                         </Grid>
 
                         <TextBlock FontStyle="Italic" HorizontalAlignment="Center">SOURCE / INVERSE</TextBlock>
-                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="00 0 0 0">SUGGESTIONS</TextBlock>
-                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4">LIQUID VOLUMES</TextBlock>
+                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="0 0 0 0">SUGGESTIONS</TextBlock>
+                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4" Margin="-80 0 0 0">LIQUID VOLUMES</TextBlock>
 
                         <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
 
@@ -318,6 +318,71 @@
                         <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image>
 
                         <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False">
+                            <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -20 0 0">
+                                <StackPanel Orientation="Horizontal" Height="60">
+                                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">R</TextBlock>
+
+                                        <Grid>
+                                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                <Rectangle.Fill>
+                                                    <SolidColorBrush Color="Red" Opacity="{Binding SelectedSuggestion.Coordinates.Red,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                                </Rectangle.Fill>
+                                            </Rectangle>
+                                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Red}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                        </Grid>
+                                    </DockPanel>
+                                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">G</TextBlock>
+                                        <Grid>
+                                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                <Rectangle.Fill>
+                                                    <SolidColorBrush Color="Green" Opacity="{Binding SelectedSuggestion.Coordinates.Green,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                                </Rectangle.Fill>
+                                            </Rectangle>
+                                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Green}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                        </Grid>
+                                    </DockPanel>
+                                    <DockPanel Width="50" HorizontalAlignment="Left">
+                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+                                        <Grid>
+                                            <Rectangle Margin="0 5 0 0" Stroke="#202020">
+                                                <Rectangle.Fill>
+                                                    <SolidColorBrush Color="Blue" Opacity="{Binding SelectedSuggestion.Coordinates.Blue,Converter={StaticResource ColorComponentToOpacityConverter}}" />
+                                                </Rectangle.Fill>
+                                            </Rectangle>
+                                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.Blue}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                        </Grid>
+                                    </DockPanel>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">L</TextBlock>
+
+                                        <Grid>
+                                            <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.L,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                        </Grid>
+                                    </DockPanel>
+                                    <DockPanel Width="50" HorizontalAlignment="Left" Margin="0 0 5 0">
+                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">A</TextBlock>
+
+                                        <Grid>
+                                            <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.A,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                        </Grid>
+                                    </DockPanel>
+                                    <DockPanel Width="50" HorizontalAlignment="Left">
+                                        <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">B</TextBlock>
+
+                                        <Grid>
+                                            <Rectangle Margin="0 5 0 0" Stroke="#202020"/>
+                                            <TextBlock Text="{Binding SelectedSuggestion.Coordinates.B,StringFormat='0.00'}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black"></TextBlock>
+                                        </Grid>
+                                    </DockPanel>
+                                </StackPanel>
+                            </StackPanel>
+
                             <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center" MinWidth="420" >
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs
index 2a05afbfa..4c3125bf7 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs
@@ -235,6 +235,78 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// gate cfg 1
+        /// </summary>
+        public Int32 GateCfg1 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// gate cfg 2
+        /// </summary>
+        public Int32 GateCfg2 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t val hold
+        /// </summary>
+        public Int32 TValHold 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t val run
+        /// </summary>
+        public Int32 TValRun 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t val acc
+        /// </summary>
+        public Int32 TValAcc 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t val dec
+        /// </summary>
+        public Int32 TValDec 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t fast
+        /// </summary>
+        public Int32 TFast 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t on min
+        /// </summary>
+        public Int32 TOnMin 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// t off min
+        /// </summary>
+        public Int32 TOffMin 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// active
         /// </summary>
         public Boolean Active 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs
index 5929037df..54bea3973 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs
@@ -78,6 +78,24 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> FsSpdChanged;
 
+        public event EventHandler<Int32> GateCfg1Changed;
+
+        public event EventHandler<Int32> GateCfg2Changed;
+
+        public event EventHandler<Int32> TValHoldChanged;
+
+        public event EventHandler<Int32> TValRunChanged;
+
+        public event EventHandler<Int32> TValAccChanged;
+
+        public event EventHandler<Int32> TValDecChanged;
+
+        public event EventHandler<Int32> TFastChanged;
+
+        public event EventHandler<Int32> TOnMinChanged;
+
+        public event EventHandler<Int32> TOffMinChanged;
+
         public event EventHandler<Boolean> ActiveChanged;
 
         public event EventHandler<HardwareMotorType> HardwareMotorTypeChanged;
@@ -784,6 +802,249 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _gatecfg1;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase gate cfg 1.
+        /// </summary>
+
+        [Column("GATE_CFG_1")]
+
+        public  Int32 GateCfg1
+        {
+            get 
+            {
+                return _gatecfg1; 
+            }
+
+            set 
+            {
+                if (_gatecfg1 != value)
+                {
+                    _gatecfg1 = value;
+
+                    OnGateCfg1Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _gatecfg2;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase gate cfg 2.
+        /// </summary>
+
+        [Column("GATE_CFG_2")]
+
+        public  Int32 GateCfg2
+        {
+            get 
+            {
+                return _gatecfg2; 
+            }
+
+            set 
+            {
+                if (_gatecfg2 != value)
+                {
+                    _gatecfg2 = value;
+
+                    OnGateCfg2Changed(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tvalhold;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t val hold.
+        /// </summary>
+
+        [Column("T_VAL_HOLD")]
+
+        public  Int32 TValHold
+        {
+            get 
+            {
+                return _tvalhold; 
+            }
+
+            set 
+            {
+                if (_tvalhold != value)
+                {
+                    _tvalhold = value;
+
+                    OnTValHoldChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tvalrun;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t val run.
+        /// </summary>
+
+        [Column("T_VAL_RUN")]
+
+        public  Int32 TValRun
+        {
+            get 
+            {
+                return _tvalrun; 
+            }
+
+            set 
+            {
+                if (_tvalrun != value)
+                {
+                    _tvalrun = value;
+
+                    OnTValRunChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tvalacc;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t val acc.
+        /// </summary>
+
+        [Column("T_VAL_ACC")]
+
+        public  Int32 TValAcc
+        {
+            get 
+            {
+                return _tvalacc; 
+            }
+
+            set 
+            {
+                if (_tvalacc != value)
+                {
+                    _tvalacc = value;
+
+                    OnTValAccChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tvaldec;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t val dec.
+        /// </summary>
+
+        [Column("T_VAL_DEC")]
+
+        public  Int32 TValDec
+        {
+            get 
+            {
+                return _tvaldec; 
+            }
+
+            set 
+            {
+                if (_tvaldec != value)
+                {
+                    _tvaldec = value;
+
+                    OnTValDecChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tfast;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t fast.
+        /// </summary>
+
+        [Column("T_FAST")]
+
+        public  Int32 TFast
+        {
+            get 
+            {
+                return _tfast; 
+            }
+
+            set 
+            {
+                if (_tfast != value)
+                {
+                    _tfast = value;
+
+                    OnTFastChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _tonmin;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t on min.
+        /// </summary>
+
+        [Column("T_ON_MIN")]
+
+        public  Int32 TOnMin
+        {
+            get 
+            {
+                return _tonmin; 
+            }
+
+            set 
+            {
+                if (_tonmin != value)
+                {
+                    _tonmin = value;
+
+                    OnTOnMinChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _toffmin;
+
+        /// <summary>
+        /// Gets or sets the hardwaremotorbase t off min.
+        /// </summary>
+
+        [Column("T_OFF_MIN")]
+
+        public  Int32 TOffMin
+        {
+            get 
+            {
+                return _toffmin; 
+            }
+
+            set 
+            {
+                if (_toffmin != value)
+                {
+                    _toffmin = value;
+
+                    OnTOffMinChanged(value);
+
+                }
+            }
+        }
+
         protected Boolean _active;
 
         /// <summary>
@@ -1092,6 +1353,87 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the GateCfg1 has changed.
+        /// </summary>
+        protected virtual void OnGateCfg1Changed(Int32 gatecfg1)
+        {
+            GateCfg1Changed?.Invoke(this, gatecfg1);
+            RaisePropertyChanged(nameof(GateCfg1));
+        }
+
+        /// <summary>
+        /// Called when the GateCfg2 has changed.
+        /// </summary>
+        protected virtual void OnGateCfg2Changed(Int32 gatecfg2)
+        {
+            GateCfg2Changed?.Invoke(this, gatecfg2);
+            RaisePropertyChanged(nameof(GateCfg2));
+        }
+
+        /// <summary>
+        /// Called when the TValHold has changed.
+        /// </summary>
+        protected virtual void OnTValHoldChanged(Int32 tvalhold)
+        {
+            TValHoldChanged?.Invoke(this, tvalhold);
+            RaisePropertyChanged(nameof(TValHold));
+        }
+
+        /// <summary>
+        /// Called when the TValRun has changed.
+        /// </summary>
+        protected virtual void OnTValRunChanged(Int32 tvalrun)
+        {
+            TValRunChanged?.Invoke(this, tvalrun);
+            RaisePropertyChanged(nameof(TValRun));
+        }
+
+        /// <summary>
+        /// Called when the TValAcc has changed.
+        /// </summary>
+        protected virtual void OnTValAccChanged(Int32 tvalacc)
+        {
+            TValAccChanged?.Invoke(this, tvalacc);
+            RaisePropertyChanged(nameof(TValAcc));
+        }
+
+        /// <summary>
+        /// Called when the TValDec has changed.
+        /// </summary>
+        protected virtual void OnTValDecChanged(Int32 tvaldec)
+        {
+            TValDecChanged?.Invoke(this, tvaldec);
+            RaisePropertyChanged(nameof(TValDec));
+        }
+
+        /// <summary>
+        /// Called when the TFast has changed.
+        /// </summary>
+        protected virtual void OnTFastChanged(Int32 tfast)
+        {
+            TFastChanged?.Invoke(this, tfast);
+            RaisePropertyChanged(nameof(TFast));
+        }
+
+        /// <summary>
+        /// Called when the TOnMin has changed.
+        /// </summary>
+        protected virtual void OnTOnMinChanged(Int32 tonmin)
+        {
+            TOnMinChanged?.Invoke(this, tonmin);
+            RaisePropertyChanged(nameof(TOnMin));
+        }
+
+        /// <summary>
+        /// Called when the TOffMin has changed.
+        /// </summary>
+        protected virtual void OnTOffMinChanged(Int32 toffmin)
+        {
+            TOffMinChanged?.Invoke(this, toffmin);
+            RaisePropertyChanged(nameof(TOffMin));
+        }
+
+        /// <summary>
         /// Called when the Active has changed.
         /// </summary>
         protected virtual void OnActiveChanged(Boolean active)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index fd8f3d2d1..63c0a9dbe 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -15,7 +15,9 @@ namespace Tango.BL.Entities
         /// </summary>
         public Rml() : base()
         {
-
+            WhitePointL = 92.1815;
+            WhitePointA = 2.2555;
+            WhitePointB = -10.9325;
         }
 
         protected override void OnWhitePointLChanged(double whitepointl)
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareMotorTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareMotorTypes.cs
index 168896c07..3e860036c 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareMotorTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareMotorTypes.cs
@@ -193,5 +193,11 @@ namespace Tango.BL.Enumerations
         [Description("Spare 4 Motor")]
         MOTO_SPARE2_2 = 28,
 
+        /// <summary>
+        /// (Spare 5 Motor)
+        /// </summary>
+        [Description("Spare 5 Motor")]
+        MOTO_SPARE3_1 = 29,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
index d40ee52db..800775d64 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/Roles.cs
@@ -92,6 +92,12 @@ namespace Tango.BL.Enumerations
         TCCUser = 15,
 
         /// <summary>
+        /// (Catalogs Manager)
+        /// </summary>
+        [Description("Catalogs Manager")]
+        CatalogsManager = 16,
+
+        /// <summary>
         /// (PPC Application Publisher)
         /// </summary>
         [Description("PPC Application Publisher")]
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
index 98933b434..3f68baea7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_MOTORS.cs
@@ -43,6 +43,15 @@ namespace Tango.DAL.Remote.DB
         public int FN_SLP_ACC { get; set; }
         public int FN_SLP_DEC { get; set; }
         public int FS_SPD { get; set; }
+        public int GATE_CFG_1 { get; set; }
+        public int GATE_CFG_2 { get; set; }
+        public int T_VAL_HOLD { get; set; }
+        public int T_VAL_RUN { get; set; }
+        public int T_VAL_ACC { get; set; }
+        public int T_VAL_DEC { get; set; }
+        public int T_FAST { get; set; }
+        public int T_ON_MIN { get; set; }
+        public int T_OFF_MIN { get; set; }
         public bool ACTIVE { get; set; }
     
         public virtual HARDWARE_MOTOR_TYPES HARDWARE_MOTOR_TYPES { 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 51ae48dcc..cb6a660c7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -440,6 +440,15 @@
           <Property Name="FN_SLP_ACC" Type="int" Nullable="false" />
           <Property Name="FN_SLP_DEC" Type="int" Nullable="false" />
           <Property Name="FS_SPD" Type="int" Nullable="false" />
+          <Property Name="GATE_CFG_1" Type="int" Nullable="false" />
+          <Property Name="GATE_CFG_2" Type="int" Nullable="false" />
+          <Property Name="T_VAL_HOLD" Type="int" Nullable="false" />
+          <Property Name="T_VAL_RUN" Type="int" Nullable="false" />
+          <Property Name="T_VAL_ACC" Type="int" Nullable="false" />
+          <Property Name="T_VAL_DEC" Type="int" Nullable="false" />
+          <Property Name="T_FAST" Type="int" Nullable="false" />
+          <Property Name="T_ON_MIN" Type="int" Nullable="false" />
+          <Property Name="T_OFF_MIN" Type="int" Nullable="false" />
           <Property Name="ACTIVE" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="HARDWARE_PID_CONTROL_TYPES">
@@ -3407,6 +3416,15 @@
           <Property Name="FN_SLP_ACC" Type="Int32" Nullable="false" />
           <Property Name="FN_SLP_DEC" Type="Int32" Nullable="false" />
           <Property Name="FS_SPD" Type="Int32" Nullable="false" />
+          <Property Name="GATE_CFG_1" Type="Int32" Nullable="false" />
+          <Property Name="GATE_CFG_2" Type="Int32" Nullable="false" />
+          <Property Name="T_VAL_HOLD" Type="Int32" Nullable="false" />
+          <Property Name="T_VAL_RUN" Type="Int32" Nullable="false" />
+          <Property Name="T_VAL_ACC" Type="Int32" Nullable="false" />
+          <Property Name="T_VAL_DEC" Type="Int32" Nullable="false" />
+          <Property Name="T_FAST" Type="Int32" Nullable="false" />
+          <Property Name="T_ON_MIN" Type="Int32" Nullable="false" />
+          <Property Name="T_OFF_MIN" Type="Int32" Nullable="false" />
           <Property Name="ACTIVE" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="HARDWARE_MOTOR_TYPES" Relationship="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_MOTOR_TYPES" FromRole="HARDWARE_MOTORS" ToRole="HARDWARE_MOTOR_TYPES" />
           <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_VERSIONS" FromRole="HARDWARE_MOTORS" ToRole="HARDWARE_VERSIONS" />
@@ -5633,6 +5651,15 @@
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_MOTORS">
               <MappingFragment StoreEntitySet="HARDWARE_MOTORS">
                 <ScalarProperty Name="ACTIVE" ColumnName="ACTIVE" />
+                <ScalarProperty Name="T_OFF_MIN" ColumnName="T_OFF_MIN" />
+                <ScalarProperty Name="T_ON_MIN" ColumnName="T_ON_MIN" />
+                <ScalarProperty Name="T_FAST" ColumnName="T_FAST" />
+                <ScalarProperty Name="T_VAL_DEC" ColumnName="T_VAL_DEC" />
+                <ScalarProperty Name="T_VAL_ACC" ColumnName="T_VAL_ACC" />
+                <ScalarProperty Name="T_VAL_RUN" ColumnName="T_VAL_RUN" />
+                <ScalarProperty Name="T_VAL_HOLD" ColumnName="T_VAL_HOLD" />
+                <ScalarProperty Name="GATE_CFG_2" ColumnName="GATE_CFG_2" />
+                <ScalarProperty Name="GATE_CFG_1" ColumnName="GATE_CFG_1" />
                 <ScalarProperty Name="FS_SPD" ColumnName="FS_SPD" />
                 <ScalarProperty Name="FN_SLP_DEC" ColumnName="FN_SLP_DEC" />
                 <ScalarProperty Name="FN_SLP_ACC" ColumnName="FN_SLP_ACC" />
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 685a2b3ee..f1374cb5d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,79 +5,79 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="42" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="28.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="35.875" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="21" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="14.25" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="14.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="9.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="8.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="31.375" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="46.125" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="14.25" PointY="13.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="12" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="14.25" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="38.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="28" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="28.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="48.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="33.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="15.75" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="18" PointY="37.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="52.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="38.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="14.75" PointY="49" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="17" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="38.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="36.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="31.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="15.75" PointY="57.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="18" PointY="42" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="14.25" PointY="4.5" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="16.5" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="18.75" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="16.5" PointY="18.375" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="31.625" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="3.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="21.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="16.5" PointY="60.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="27.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="18.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="25.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="22" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="34.5" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="14.25" PointY="45.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="44" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="17.25" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="52.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="18.625" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="17.25" PointY="45.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="19.5" PointY="45.875" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="18.75" PointY="23.5" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="17.5" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="20.5" PointY="34.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="0.75" PointY="5.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="6.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="5.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="2.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="14.25" PointY="29.875" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="19.5" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="14.25" PointY="35.125" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="42" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="29" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="34.875" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="20.875" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="33.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="8.25" PointY="35.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="10.5" PointY="36" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="12.75" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="24.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="8.25" PointY="31.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="56.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="56.125" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="31.875" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="13.25" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="7.75" PointY="65.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="10" PointY="47" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="14.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="17" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="61.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="41.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.75" PointY="47.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="15" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="55.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="45.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="53.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="40" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="37.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="11.75" PointY="51.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="14" PointY="31.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.75" PointY="19.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.5" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="30.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="14.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="15.5" PointY="15.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="13.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="24.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="27.625" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="53" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="7.375" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9.25" PointY="69.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="47.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9.25" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.5" PointY="1.125" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.75" PointY="22.875" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="40.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="17.5" PointY="20.875" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="17.5" PointY="25.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="0.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="0.75" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="11.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="5.75" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="12.125" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.5" PointY="10.125" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8.25" PointY="28.375" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
diff --git a/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs b/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs
new file mode 100644
index 000000000..02faf67a9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Debugging/DebugDistributorType.cs
@@ -0,0 +1,65 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: DebugDistributorType.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.Debugging {
+
+  /// <summary>Holder for reflection information generated from DebugDistributorType.proto</summary>
+  public static partial class DebugDistributorTypeReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for DebugDistributorType.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static DebugDistributorTypeReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChpEZWJ1Z0Rpc3RyaWJ1dG9yVHlwZS5wcm90bxITVGFuZ28uUE1SLkRlYnVn",
+            "Z2luZyqpAgoURGVidWdEaXN0cmlidXRvclR5cGUSEQoNQ29udHJvbEZpbHRl",
+            "chAAEhEKDUhlYXRlcnNGaWx0ZXIQARINCglKb2JGaWx0ZXIQAhIPCgtXYXN0",
+            "ZUZpbHRlchADEg8KC0FsYXJtRmlsdGVyEAQSFQoRRGlhZ25vc3RpY3NGaWx0",
+            "ZXIQBRINCglJRFNGaWx0ZXIQBhIQCgxUaHJlYWRGaWx0ZXIQBxIRCg1HZW5l",
+            "cmFsRmlsdGVyEAgSDgoKQ29tbUZpbHRlchAJEg4KCkZQR0FGaWx0ZXIQChIO",
+            "CgpMb2FkRmlsdGVyEAsSDgoKSW5pdEZpbHRlchAMEg8KC01haW50RmlsdGVy",
+            "EA0SDQoJSUZTRmlsdGVyEA4SDwoLRmlsZXNGaWx0ZXIQD0IfCh1jb20udHdp",
+            "bmUudGFuZ28ucG1yLmRlYnVnZ2luZ2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Debugging.DebugDistributorType), }, null));
+    }
+    #endregion
+
+  }
+  #region Enums
+  public enum DebugDistributorType {
+    [pbr::OriginalName("ControlFilter")] ControlFilter = 0,
+    [pbr::OriginalName("HeatersFilter")] HeatersFilter = 1,
+    [pbr::OriginalName("JobFilter")] JobFilter = 2,
+    [pbr::OriginalName("WasteFilter")] WasteFilter = 3,
+    [pbr::OriginalName("AlarmFilter")] AlarmFilter = 4,
+    [pbr::OriginalName("DiagnosticsFilter")] DiagnosticsFilter = 5,
+    [pbr::OriginalName("IDSFilter")] Idsfilter = 6,
+    [pbr::OriginalName("ThreadFilter")] ThreadFilter = 7,
+    [pbr::OriginalName("GeneralFilter")] GeneralFilter = 8,
+    [pbr::OriginalName("CommFilter")] CommFilter = 9,
+    [pbr::OriginalName("FPGAFilter")] Fpgafilter = 10,
+    [pbr::OriginalName("LoadFilter")] LoadFilter = 11,
+    [pbr::OriginalName("InitFilter")] InitFilter = 12,
+    [pbr::OriginalName("MaintFilter")] MaintFilter = 13,
+    [pbr::OriginalName("IFSFilter")] Ifsfilter = 14,
+    [pbr::OriginalName("FilesFilter")] FilesFilter = 15,
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
index bbf37f866..8bbbbba73 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotor.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChNIYXJkd2FyZU1vdG9yLnByb3RvEhJUYW5nby5QTVIuSGFyZHdhcmUaF0hh",
-            "cmR3YXJlTW90b3JUeXBlLnByb3RvIt4ECg1IYXJkd2FyZU1vdG9yEkAKEUhh",
+            "cmR3YXJlTW90b3JUeXBlLnByb3RvIvcFCg1IYXJkd2FyZU1vdG9yEkAKEUhh",
             "cmR3YXJlTW90b3JUeXBlGAEgASgOMiUuVGFuZ28uUE1SLkhhcmR3YXJlLkhh",
             "cmR3YXJlTW90b3JUeXBlEhQKDE1pbkZyZXF1ZW5jeRgCIAEoBRIUCgxNYXhG",
             "cmVxdWVuY3kYAyABKAUSFAoMU2V0TWljcm9TdGVwGAQgASgFEhEKCU1pY3Jv",
@@ -37,11 +37,15 @@ namespace Tango.PMR.Hardware {
             "b21wZW5zYXRpb25GYWN0b3IYEyABKAUSHAoUTG93U3BlZWRPcHRpbWl6YXRp",
             "b24YFCABKAgSDQoFU3RTbHAYFSABKAUSDgoGSW50U3BkGBYgASgFEhAKCEZu",
             "U2xwQWNjGBcgASgFEhAKCEZuU2xwRGVjGBggASgFEg0KBUZzU3BkGBkgASgF",
-            "Qh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw=="));
+            "EhAKCEdhdGVDZmcxGBogASgFEhAKCEdhdGVDZmcyGBsgASgFEhAKCFRWYWxI",
+            "b2xkGBwgASgFEg8KB1RWYWxSdW4YHSABKAUSDwoHVFZhbEFjYxgeIAEoBRIP",
+            "CgdUVmFsRGVjGB8gASgFEg0KBVRGYXN0GCAgASgFEg4KBlRPbk1pbhghIAEo",
+            "BRIPCgdUT2ZmTWluGCIgASgFQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFy",
+            "ZHdhcmViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwareMotorTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareMotor), global::Tango.PMR.Hardware.HardwareMotor.Parser, new[]{ "HardwareMotorType", "MinFrequency", "MaxFrequency", "SetMicroStep", "MicroStep", "MaxChangeSlope", "HighLengthMicroSecond", "SpeedMaster", "PulsePerRound", "PulleyRadius", "ConfigWord", "DirectionThreadWize", "KvalHold", "KvalRun", "KvalAcc", "KvalDec", "OverCurrentThreshold", "StallThreshold", "ThermalCompensationFactor", "LowSpeedOptimization", "StSlp", "IntSpd", "FnSlpAcc", "FnSlpDec", "FsSpd" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareMotor), global::Tango.PMR.Hardware.HardwareMotor.Parser, new[]{ "HardwareMotorType", "MinFrequency", "MaxFrequency", "SetMicroStep", "MicroStep", "MaxChangeSlope", "HighLengthMicroSecond", "SpeedMaster", "PulsePerRound", "PulleyRadius", "ConfigWord", "DirectionThreadWize", "KvalHold", "KvalRun", "KvalAcc", "KvalDec", "OverCurrentThreshold", "StallThreshold", "ThermalCompensationFactor", "LowSpeedOptimization", "StSlp", "IntSpd", "FnSlpAcc", "FnSlpDec", "FsSpd", "GateCfg1", "GateCfg2", "TValHold", "TValRun", "TValAcc", "TValDec", "TFast", "TOnMin", "TOffMin" }, null, null, null)
           }));
     }
     #endregion
@@ -97,6 +101,15 @@ namespace Tango.PMR.Hardware {
       fnSlpAcc_ = other.fnSlpAcc_;
       fnSlpDec_ = other.fnSlpDec_;
       fsSpd_ = other.fsSpd_;
+      gateCfg1_ = other.gateCfg1_;
+      gateCfg2_ = other.gateCfg2_;
+      tValHold_ = other.tValHold_;
+      tValRun_ = other.tValRun_;
+      tValAcc_ = other.tValAcc_;
+      tValDec_ = other.tValDec_;
+      tFast_ = other.tFast_;
+      tOnMin_ = other.tOnMin_;
+      tOffMin_ = other.tOffMin_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -382,6 +395,105 @@ namespace Tango.PMR.Hardware {
       }
     }
 
+    /// <summary>Field number for the "GateCfg1" field.</summary>
+    public const int GateCfg1FieldNumber = 26;
+    private int gateCfg1_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int GateCfg1 {
+      get { return gateCfg1_; }
+      set {
+        gateCfg1_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "GateCfg2" field.</summary>
+    public const int GateCfg2FieldNumber = 27;
+    private int gateCfg2_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int GateCfg2 {
+      get { return gateCfg2_; }
+      set {
+        gateCfg2_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TValHold" field.</summary>
+    public const int TValHoldFieldNumber = 28;
+    private int tValHold_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TValHold {
+      get { return tValHold_; }
+      set {
+        tValHold_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TValRun" field.</summary>
+    public const int TValRunFieldNumber = 29;
+    private int tValRun_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TValRun {
+      get { return tValRun_; }
+      set {
+        tValRun_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TValAcc" field.</summary>
+    public const int TValAccFieldNumber = 30;
+    private int tValAcc_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TValAcc {
+      get { return tValAcc_; }
+      set {
+        tValAcc_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TValDec" field.</summary>
+    public const int TValDecFieldNumber = 31;
+    private int tValDec_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TValDec {
+      get { return tValDec_; }
+      set {
+        tValDec_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TFast" field.</summary>
+    public const int TFastFieldNumber = 32;
+    private int tFast_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TFast {
+      get { return tFast_; }
+      set {
+        tFast_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TOnMin" field.</summary>
+    public const int TOnMinFieldNumber = 33;
+    private int tOnMin_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TOnMin {
+      get { return tOnMin_; }
+      set {
+        tOnMin_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "TOffMin" field.</summary>
+    public const int TOffMinFieldNumber = 34;
+    private int tOffMin_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int TOffMin {
+      get { return tOffMin_; }
+      set {
+        tOffMin_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as HardwareMotor);
@@ -420,6 +532,15 @@ namespace Tango.PMR.Hardware {
       if (FnSlpAcc != other.FnSlpAcc) return false;
       if (FnSlpDec != other.FnSlpDec) return false;
       if (FsSpd != other.FsSpd) return false;
+      if (GateCfg1 != other.GateCfg1) return false;
+      if (GateCfg2 != other.GateCfg2) return false;
+      if (TValHold != other.TValHold) return false;
+      if (TValRun != other.TValRun) return false;
+      if (TValAcc != other.TValAcc) return false;
+      if (TValDec != other.TValDec) return false;
+      if (TFast != other.TFast) return false;
+      if (TOnMin != other.TOnMin) return false;
+      if (TOffMin != other.TOffMin) return false;
       return true;
     }
 
@@ -451,6 +572,15 @@ namespace Tango.PMR.Hardware {
       if (FnSlpAcc != 0) hash ^= FnSlpAcc.GetHashCode();
       if (FnSlpDec != 0) hash ^= FnSlpDec.GetHashCode();
       if (FsSpd != 0) hash ^= FsSpd.GetHashCode();
+      if (GateCfg1 != 0) hash ^= GateCfg1.GetHashCode();
+      if (GateCfg2 != 0) hash ^= GateCfg2.GetHashCode();
+      if (TValHold != 0) hash ^= TValHold.GetHashCode();
+      if (TValRun != 0) hash ^= TValRun.GetHashCode();
+      if (TValAcc != 0) hash ^= TValAcc.GetHashCode();
+      if (TValDec != 0) hash ^= TValDec.GetHashCode();
+      if (TFast != 0) hash ^= TFast.GetHashCode();
+      if (TOnMin != 0) hash ^= TOnMin.GetHashCode();
+      if (TOffMin != 0) hash ^= TOffMin.GetHashCode();
       return hash;
     }
 
@@ -561,6 +691,42 @@ namespace Tango.PMR.Hardware {
         output.WriteRawTag(200, 1);
         output.WriteInt32(FsSpd);
       }
+      if (GateCfg1 != 0) {
+        output.WriteRawTag(208, 1);
+        output.WriteInt32(GateCfg1);
+      }
+      if (GateCfg2 != 0) {
+        output.WriteRawTag(216, 1);
+        output.WriteInt32(GateCfg2);
+      }
+      if (TValHold != 0) {
+        output.WriteRawTag(224, 1);
+        output.WriteInt32(TValHold);
+      }
+      if (TValRun != 0) {
+        output.WriteRawTag(232, 1);
+        output.WriteInt32(TValRun);
+      }
+      if (TValAcc != 0) {
+        output.WriteRawTag(240, 1);
+        output.WriteInt32(TValAcc);
+      }
+      if (TValDec != 0) {
+        output.WriteRawTag(248, 1);
+        output.WriteInt32(TValDec);
+      }
+      if (TFast != 0) {
+        output.WriteRawTag(128, 2);
+        output.WriteInt32(TFast);
+      }
+      if (TOnMin != 0) {
+        output.WriteRawTag(136, 2);
+        output.WriteInt32(TOnMin);
+      }
+      if (TOffMin != 0) {
+        output.WriteRawTag(144, 2);
+        output.WriteInt32(TOffMin);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -641,6 +807,33 @@ namespace Tango.PMR.Hardware {
       if (FsSpd != 0) {
         size += 2 + pb::CodedOutputStream.ComputeInt32Size(FsSpd);
       }
+      if (GateCfg1 != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(GateCfg1);
+      }
+      if (GateCfg2 != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(GateCfg2);
+      }
+      if (TValHold != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TValHold);
+      }
+      if (TValRun != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TValRun);
+      }
+      if (TValAcc != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TValAcc);
+      }
+      if (TValDec != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TValDec);
+      }
+      if (TFast != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TFast);
+      }
+      if (TOnMin != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TOnMin);
+      }
+      if (TOffMin != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(TOffMin);
+      }
       return size;
     }
 
@@ -724,6 +917,33 @@ namespace Tango.PMR.Hardware {
       if (other.FsSpd != 0) {
         FsSpd = other.FsSpd;
       }
+      if (other.GateCfg1 != 0) {
+        GateCfg1 = other.GateCfg1;
+      }
+      if (other.GateCfg2 != 0) {
+        GateCfg2 = other.GateCfg2;
+      }
+      if (other.TValHold != 0) {
+        TValHold = other.TValHold;
+      }
+      if (other.TValRun != 0) {
+        TValRun = other.TValRun;
+      }
+      if (other.TValAcc != 0) {
+        TValAcc = other.TValAcc;
+      }
+      if (other.TValDec != 0) {
+        TValDec = other.TValDec;
+      }
+      if (other.TFast != 0) {
+        TFast = other.TFast;
+      }
+      if (other.TOnMin != 0) {
+        TOnMin = other.TOnMin;
+      }
+      if (other.TOffMin != 0) {
+        TOffMin = other.TOffMin;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -834,6 +1054,42 @@ namespace Tango.PMR.Hardware {
             FsSpd = input.ReadInt32();
             break;
           }
+          case 208: {
+            GateCfg1 = input.ReadInt32();
+            break;
+          }
+          case 216: {
+            GateCfg2 = input.ReadInt32();
+            break;
+          }
+          case 224: {
+            TValHold = input.ReadInt32();
+            break;
+          }
+          case 232: {
+            TValRun = input.ReadInt32();
+            break;
+          }
+          case 240: {
+            TValAcc = input.ReadInt32();
+            break;
+          }
+          case 248: {
+            TValDec = input.ReadInt32();
+            break;
+          }
+          case 256: {
+            TFast = input.ReadInt32();
+            break;
+          }
+          case 264: {
+            TOnMin = input.ReadInt32();
+            break;
+          }
+          case 272: {
+            TOffMin = input.ReadInt32();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotorType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotorType.cs
index 3ba39df3a..501fa1ad0 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotorType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareMotorType.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChdIYXJkd2FyZU1vdG9yVHlwZS5wcm90bxISVGFuZ28uUE1SLkhhcmR3YXJl",
-            "KtwEChFIYXJkd2FyZU1vdG9yVHlwZRIVChFNT1RPX0RIX0NMRUFOSEVBRBAA",
+            "Ku8EChFIYXJkd2FyZU1vdG9yVHlwZRIVChFNT1RPX0RIX0NMRUFOSEVBRBAA",
             "EhUKEU1PVE9fREhfQ0xFQU5NRUNIEAESDwoLTU9UT19ESF9MSUQQAhIWChJN",
             "T1RPX0RSWUVSX0RSSVZJTkcQAxISCg5NT1RPX0RSWUVSX0xJRBAEEhYKEk1P",
             "VE9fRFJZRVJfTE9BREFSTRAFEhQKEE1PVE9fRElTUEVOU0VSXzEQBhIUChBN",
@@ -36,8 +36,8 @@ namespace Tango.PMR.Hardware {
             "Vk9UMRAUEhAKDE1PVE9fUkRBTkNFUhAVEhEKDU1PVE9fUkRSSVZJTkcQFhIR",
             "Cg1NT1RPX1JMT0FEQVJNEBcSEQoNTU9UT19STE9BRElORxAYEhEKDU1PVE9f",
             "U1BBUkUxXzEQGRIRCg1NT1RPX1NQQVJFMV8yEBoSEQoNTU9UT19TUEFSRTJf",
-            "MRAbEhEKDU1PVE9fU1BBUkUyXzIQHEIeChxjb20udHdpbmUudGFuZ28ucG1y",
-            "LmhhcmR3YXJlYgZwcm90bzM="));
+            "MRAbEhEKDU1PVE9fU1BBUkUyXzIQHBIRCg1NT1RPX1NQQVJFM18xEB1CHgoc",
+            "Y29tLnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareMotorType), }, null));
@@ -163,6 +163,10 @@ namespace Tango.PMR.Hardware {
     ///Spare 4 Motor
     /// </summary>
     [pbr::OriginalName("MOTO_SPARE2_2")] MotoSpare22 = 28,
+    /// <summary>
+    ///Spare 5 Motor
+    /// </summary>
+    [pbr::OriginalName("MOTO_SPARE3_1")] MotoSpare31 = 29,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 7e417e64b..8502b506d 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -71,6 +71,7 @@
     <Compile Include="Connection\KeepAliveRequest.cs" />
     <Compile Include="Connection\KeepAliveResponse.cs" />
     <Compile Include="Debugging\DebugDistributor.cs" />
+    <Compile Include="Debugging\DebugDistributorType.cs" />
     <Compile Include="Debugging\DebugLogCategory.cs" />
     <Compile Include="Debugging\SetupDebugDisributorsRequest.cs" />
     <Compile Include="Debugging\SetupDebugDisributorsResponse.cs" />
@@ -288,7 +289,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