From 7ef2f5156e8a7958ee6425f53158f94974762ef9 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 12 May 2019 16:22:55 +0300
Subject: Fixed CircleActionButton on TCC. Prevent continues messages from
 updating after complete or error. Fixed diagnostics not resuming MS <=> PPC
 after PPC <=> Machine disconnection.

---
 .../Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs      | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 72e43d7b0..ab5d2ebb1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -405,6 +405,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <param name="data">The data.</param>
         private void PopulateDiagnosticsData(StartDiagnosticsResponse data)
         {
+            if (data.Monitors == null) return;
+
             TimeSpan delta_base = DateTime.Now - _start_time;
             TimeSpan delta = (DateTime.Now - _last_time);
             double delta_mili = delta.TotalMilliseconds;
-- 
cgit v1.3.1


From 2b8937314aef20b7ebec18c9b0f1f3f7f98541c6 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 15 May 2019 09:19:16 +0300
Subject: Working on emulated3D..

---
 .../Models/Emulated3DModel.cs                      | 61 +++++++++++++++++++
 .../Models/LightingModes.cs                        | 16 +++++
 .../Tango.MachineStudio.ColorCapture.csproj        |  2 +
 .../ViewModels/MainViewVM.cs                       |  9 +++
 .../Views/MainView.xaml                            | 69 ++++++++++++++++++----
 .../Views/MainView.xaml.cs                         | 16 +++++
 6 files changed, 162 insertions(+), 11 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/Emulated3DModel.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/LightingModes.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/Emulated3DModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/Emulated3DModel.cs
new file mode 100644
index 000000000..5153277ce
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/Emulated3DModel.cs
@@ -0,0 +1,61 @@
+using HelixToolkit.Wpf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+
+namespace Tango.MachineStudio.ColorCapture.Models
+{
+    public class Emulated3DModel : ExtendedObject
+    {
+        private DefaultLights _defaultLights;
+        private ThreePointLights _threePointLights;
+        private DirectionalHeadLight _directionalHeadLights;
+        private SpotHeadLight _spotHeadLight;
+
+        public Emulated3DModel()
+        {
+            _defaultLights = new DefaultLights();
+            _threePointLights = new ThreePointLights();
+            _directionalHeadLights = new DirectionalHeadLight();
+            _spotHeadLight = new SpotHeadLight();
+
+            CurrentMode = LightingModes.Default;
+        }
+
+        private LightSetup _currentLight;
+        public LightSetup CurrentLight
+        {
+            get { return _currentLight; }
+            set { _currentLight = value; RaisePropertyChangedAuto(); }
+        }
+
+        private LightingModes _currentMode;
+        public LightingModes CurrentMode
+        {
+            get { return _currentMode; }
+            set { _currentMode = value; RaisePropertyChangedAuto(); OnCurrentModeChanged(); }
+        }
+
+        private void OnCurrentModeChanged()
+        {
+            switch (CurrentMode)
+            {
+                case LightingModes.Default:
+                    CurrentLight = _defaultLights;
+                    break;
+                case LightingModes.DirectionalHeadLight:
+                    CurrentLight = _directionalHeadLights;
+                    break;
+                case LightingModes.SpotHeadLight:
+                    CurrentLight = _spotHeadLight;
+                    break;
+                case LightingModes.ThreePointLights:
+                    CurrentLight = _threePointLights;
+                    break;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/LightingModes.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/LightingModes.cs
new file mode 100644
index 000000000..84369f90c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/LightingModes.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.ColorCapture.Models
+{
+    public enum LightingModes
+    {
+        Default,
+        ThreePointLights,
+        DirectionalHeadLight,
+        SpotHeadLight,
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
index 1c04917c0..4825f1812 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Tango.MachineStudio.ColorCapture.csproj
@@ -125,6 +125,8 @@
     <Compile Include="Models\CaptureConfig.cs" />
     <Compile Include="Models\CaptureItem.cs" />
     <Compile Include="Models\DeltaEComparisons.cs" />
+    <Compile Include="Models\Emulated3DModel.cs" />
+    <Compile Include="Models\LightingModes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
index 38c86c297..93fe776bc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
@@ -244,6 +244,13 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels
             set { _emulatedImage = value; RaisePropertyChangedAuto(); }
         }
 
+        private Emulated3DModel _emulated3DModel;
+        public Emulated3DModel Emulated3DModel
+        {
+            get { return _emulated3DModel; }
+            set { _emulated3DModel = value; RaisePropertyChangedAuto(); }
+        }
+
         public RelayCommand ImportBenchmarksCommand { get; set; }
 
         public RelayCommand ExportBenchmarksCommand { get; set; }
@@ -285,6 +292,8 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels
             CaptureModeCommand = new RelayCommand<CaptureMode>((mode) => CaptureMode = mode);
             _emulatedActionTimer = new ActionTimer(TimeSpan.FromMilliseconds(100));
 
+            Emulated3DModel = new Emulated3DModel();
+
             _timer3D = new DispatcherTimer();
             _timer3D.Interval = TimeSpan.FromSeconds(1);
             _timer3D.Tick += _timer3D_Tick;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
index e11ae3fa3..bd26ff008 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
@@ -237,7 +237,8 @@
                                         </Grid>
                                     </Grid>
 
-                                    <Grid Visibility="{Binding CaptureMode,Converter={StaticResource CaptureModeToVisibilityConverter},ConverterParameter={x:Static global:CaptureMode.Emulated3D}}">
+                                    <!--{Binding CaptureMode,Converter={StaticResource CaptureModeToVisibilityConverter},ConverterParameter={x:Static global:CaptureMode.Emulated3D}}-->
+                                    <Grid Visibility="Visible">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="60"/>
                                             <RowDefinition Height="1*"/>
@@ -249,10 +250,15 @@
 
                                         <Grid Grid.Row="1" Background="{StaticResource Background}" Margin="1">
                                             <helix:HelixViewport3D x:Name="viewport" ShowCoordinateSystem="True" ShowViewCube="False">
-                                                <helix:DefaultLights ShowLights="True" />
+                                                <ModelVisual3D x:Name="lightsContainer">
+                                                    <helix:DefaultLights ShowLights="True" />
+                                                </ModelVisual3D>
                                                 <helix:RectangleVisual3D DivWidth="30" DivLength="30">
                                                     <helix:RectangleVisual3D.BackMaterial>
-                                                        <DiffuseMaterial Brush="Gray"></DiffuseMaterial>
+                                                        <MaterialGroup>
+                                                            <DiffuseMaterial Brush="Silver" />
+                                                            <SpecularMaterial Brush="White" SpecularPower="30"></SpecularMaterial>
+                                                        </MaterialGroup>
                                                     </helix:RectangleVisual3D.BackMaterial>
                                                     <helix:RectangleVisual3D.Material>
                                                         <MaterialGroup x:Name="material">
@@ -267,24 +273,65 @@
                                                                     </VisualBrush>
                                                                 </DiffuseMaterial.Brush>
                                                             </DiffuseMaterial>
-                                                            <SpecularMaterial Brush="White" SpecularPower="30"></SpecularMaterial>
+                                                            <SpecularMaterial x:Name="specularMaterial" Brush="White" SpecularPower="30"></SpecularMaterial>
                                                         </MaterialGroup>
                                                     </helix:RectangleVisual3D.Material>
                                                 </helix:RectangleVisual3D>
                                             </helix:HelixViewport3D>
 
                                             <Grid>
-                                                <UniformGrid Rows="4" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20">
+
+                                                <StackPanel Orientation="Horizontal" Margin="10" HorizontalAlignment="Left" VerticalAlignment="Top">
                                                     <StackPanel>
-                                                        <visuals:Knob Minimum="-100" Maximum="100" Width="40" TicksHeight="2" TicksHighlightBrush="{StaticResource Accent}" />
-                                                        <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0">Light</TextBlock>
+                                                        <TextBlock FontSize="10">Lighting</TextBlock>
+                                                        <ComboBox x:Name="comboLights" SelectionChanged="ComboBox_SelectionChanged" ItemsSource="{Binding Source={x:Type models:LightingModes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding Emulated3DModel.CurrentMode}" SelectedValuePath="Value" DisplayMemberPath="DisplayName" Margin="0 5 0 0" HorizontalAlignment="Left" BorderThickness="1" BorderBrush="{StaticResource LightBackground}" VerticalAlignment="Top" Width="200"></ComboBox>
                                                     </StackPanel>
 
-                                                    <StackPanel Margin="0 10 0 0">
-                                                        <visuals:Knob Minimum="0" Maximum="100" Width="40" TicksHeight="2" TicksHighlightBrush="{StaticResource Accent}" />
-                                                        <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0">Spectural</TextBlock>
+                                                    <StackPanel Margin="20 0 0 0">
+                                                        <visuals:Knob Minimum="0" Maximum="1" Width="40" TicksHeight="2" TicksHighlightBrush="{StaticResource Accent}" />
+                                                        <TextBlock FontSize="10" HorizontalAlignment="Center" Margin="0 5 0 0">Specular Brightness</TextBlock>
                                                     </StackPanel>
-                                                </UniformGrid>
+
+                                                    <StackPanel Margin="20 0 0 0">
+                                                        <visuals:Knob Minimum="0" Maximum="200" Value="{Binding ElementName=specularMaterial,Path=SpecularPower,Mode=TwoWay}" Width="40" TicksHeight="2" TicksHighlightBrush="{StaticResource Accent}" />
+                                                        <TextBlock FontSize="10" HorizontalAlignment="Center" Margin="0 5 0 0">Specular Power</TextBlock>
+                                                    </StackPanel>
+
+                                                    <ContentControl Content="{Binding Emulated3DModel}" Margin="20 0 0 0">
+                                                        <ContentControl.Style>
+                                                            <Style TargetType="ContentControl">
+                                                                <Setter Property="ContentTemplate">
+                                                                    <Setter.Value>
+                                                                        <DataTemplate/>
+                                                                    </Setter.Value>
+                                                                </Setter>
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding CurrentMode}" Value="Default">
+                                                                        <Setter Property="ContentTemplate">
+                                                                            <Setter.Value>
+                                                                                <DataTemplate/>
+                                                                            </Setter.Value>
+                                                                        </Setter>
+                                                                    </DataTrigger>
+                                                                    <DataTrigger Binding="{Binding CurrentMode}" Value="SpotHeadLight">
+                                                                        <Setter Property="ContentTemplate">
+                                                                            <Setter.Value>
+                                                                                <DataTemplate>
+                                                                                    <StackPanel Orientation="Horizontal">
+                                                                                        <StackPanel>
+                                                                                            <visuals:Knob Minimum="0" Maximum="1" Value="{Binding CurrentLight.Brightness,Mode=TwoWay}" Width="40" TicksHeight="2" TicksHighlightBrush="{StaticResource Accent}" />
+                                                                                            <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0">Light</TextBlock>
+                                                                                        </StackPanel>
+                                                                                    </StackPanel>
+                                                                                </DataTemplate>
+                                                                            </Setter.Value>
+                                                                        </Setter>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </ContentControl.Style>
+                                                    </ContentControl>
+                                                </StackPanel>
                                             </Grid>
                                         </Grid>
                                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
index 0bd0efe31..a35adaa23 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
@@ -17,6 +17,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Tango.Core.DI;
 using Tango.MachineStudio.ColorCapture.Contracts;
+using Tango.MachineStudio.ColorCapture.Models;
 using Tango.MachineStudio.ColorCapture.ViewModels;
 
 namespace Tango.MachineStudio.ColorCapture.Views
@@ -94,5 +95,20 @@ namespace Tango.MachineStudio.ColorCapture.Views
             ms.Dispose();
             return source;
         }
+
+        private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ReplaceLight();
+        }
+
+        private async void ReplaceLight()
+        {
+            if (_vm != null)
+            {
+                await Task.Delay(100);
+                lightsContainer.Children.Clear();
+                lightsContainer.Children.Add(_vm.Emulated3DModel.CurrentLight);
+            }
+        }
     }
 }
-- 
cgit v1.3.1


From 6cecbdc7b11836807bb53e6874b08dc06113ba18 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 15 May 2019 15:21:33 +0300
Subject: Added experimental perform CLAHE on color detector.

---
 Software/PMR/Messages/TCC/DetectionInput.proto     |   2 +-
 Software/PMR/Messages/TCC/DetectionOutput.proto    |  13 ++--
 .../PPC Installer-cache/cacheIndex.txt             | Bin 52 -> 52 bytes
 .../Advanced Installer Projects/PPC Installer.aip  |  18 +++--
 .../Models/CaptureConfig.cs                        |   7 ++
 .../ViewModels/MainViewVM.cs                       |   7 +-
 .../Views/MainView.xaml                            |   8 ++-
 .../Views/MainView.xaml.cs                         |  47 ++++++++++--
 .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs    |   2 +-
 .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest    |   2 +-
 .../TCC/Tango.TCC.BL/CardDetectionConfig.cs        |   1 +
 .../Visual_Studio/TCC/Tango.TCC.BL/CardDetector.cs |  11 +++
 .../TCC/Tango.TCC.CardDetector/CardDetection.cpp   | Bin 10390 -> 12212 bytes
 .../TCC/Tango.TCC.CardDetector/CardDetection.h     | Bin 1240 -> 1310 bytes
 .../Tango.TCC.CardDetector/CardDetectionConfig.h   |   1 +
 .../TCC/Tango.TCC.ColorDetector/ColorDetection.cpp |  65 +++++++++--------
 .../TCC/Tango.TCC.ColorDetector/ColorDetection.h   |  15 +++-
 .../PMR/TCC/DetectionInput.pb-c.c                  |  17 +++--
 .../PMR/TCC/DetectionInput.pb-c.h                  |   4 +-
 .../PMR/TCC/DetectionOutput.pb-c.c                 |  43 ++++-------
 .../PMR/TCC/DetectionOutput.pb-c.h                 |   4 +-
 .../Controllers/ColorDetectionController.cs        |   2 +-
 .../Visual_Studio/Tango.PMR/TCC/DetectionInput.cs  |  45 ++++++------
 .../Visual_Studio/Tango.PMR/TCC/DetectionOutput.cs |  80 +++++++--------------
 .../Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs |   3 -
 25 files changed, 219 insertions(+), 178 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/PMR/Messages/TCC/DetectionInput.proto b/Software/PMR/Messages/TCC/DetectionInput.proto
index d9332bbd4..a59a45d0f 100644
--- a/Software/PMR/Messages/TCC/DetectionInput.proto
+++ b/Software/PMR/Messages/TCC/DetectionInput.proto
@@ -14,5 +14,5 @@ message DetectionInput
 	bool RequestDebugImage = 5;
 	bool RequestColorMatrix = 6;
 	repeated DetectionBenchmark Benchmarks = 7;
-	double number = 10;
+	bool PerformCLAHE = 8;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/TCC/DetectionOutput.proto b/Software/PMR/Messages/TCC/DetectionOutput.proto
index cbd20ea52..55cf3608d 100644
--- a/Software/PMR/Messages/TCC/DetectionOutput.proto
+++ b/Software/PMR/Messages/TCC/DetectionOutput.proto
@@ -7,11 +7,10 @@ option java_package = "com.twine.tango.pmr.tcc";
 
 message DetectionOutput
 {
-	double number = 1;
-	DetectionColor RawColor = 2;
-	DetectionColor ProcessedColor = 3;
-	bytes DebugBitmap = 4;
-	repeated DetectionColor ColorMatrix = 5;
-	bool HasError = 6;
-	string ErrorMessage = 7;
+	DetectionColor RawColor = 1;
+	DetectionColor ProcessedColor = 2;
+	bytes DebugBitmap = 3;
+	repeated DetectionColor ColorMatrix = 4;
+	bool HasError = 5;
+	string ErrorMessage = 6;
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index a603ff06b..6d87e9201 100644
Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 35eafa66e..424e66b4d 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip	
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip	
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{FE5F6784-700F-467C-A1F2-94ABABF5D7A8} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{D7960DF7-1557-4E2E-8544-C56BB91753E2} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.0.26.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.0.27.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -115,7 +115,6 @@
     <ROW Component="Newtonsoft.Json.dll" ComponentId="{E556628B-DB87-4249-AF5E-F5D0AC9E6C32}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/>
     <ROW Component="OverrideData.xml" ComponentId="{D7B559ED-70E2-42F9-996D-2D6FDB2ED752}" Directory_="Configurations_Dir" Attributes="0" KeyPath="OverrideData.xml" Type="0"/>
     <ROW Component="ProductInformation" ComponentId="{1D49743C-F4ED-4BE9-8ED0-3792287247F6}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
-    <ROW Component="ProtoCompilers" ComponentId="{ED179509-B252-43BA-94CC-AA7D8BA8A709}" Directory_="ProtoCompilers_Dir" Attributes="0"/>
     <ROW Component="SA.Binary.dll" ComponentId="{FCC45B67-1B47-46A2-8C0A-6CAA78E7C9F0}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.Binary.dll"/>
     <ROW Component="SA.CodeView.dll" ComponentId="{0C133131-0EB4-4E2B-885F-B62EECF039AB}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.CodeView.dll"/>
     <ROW Component="SA.CommonTypes.dll" ComponentId="{7CE9EB0C-3192-4540-8A08-E7E6C59AA62A}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.CommonTypes.dll"/>
@@ -212,13 +211,16 @@
     <ROW Component="csi.exe" ComponentId="{E336E715-213E-4B46-9EC8-6512CDA2BC73}" Directory_="roslyn_Dir" Attributes="0" KeyPath="csi.exe"/>
     <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/>
     <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/>
+    <ROW Component="protoc.exe" ComponentId="{131E0FDB-687D-4F21-A394-30D75036BA27}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc.exe"/>
+    <ROW Component="protoc1.0M4.jar" ComponentId="{D50B5B91-D2FC-4C9A-9809-651AE0958130}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc1.0M4.jar" Type="0"/>
+    <ROW Component="protocc.exe" ComponentId="{24B8B558-172D-40F8-BC59-B6AEDC656738}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protocc.exe"/>
     <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/>
     <ROW Component="vbc.exe" ComponentId="{4744BEEE-9411-407E-A359-C3755394DF7C}" Directory_="roslyn_Dir" Attributes="0" KeyPath="vbc.exe"/>
     <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/>
     <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Build.Tasks.CodeAnalysis.dll Microsoft.CodeAnalysis.CSharp.Scripting.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.CodeAnalysis.Scripting.dll Microsoft.CodeAnalysis.VisualBasic.dll Microsoft.CodeAnalysis.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.DiaSymReader.Native.amd64.dll Microsoft.DiaSymReader.Native.x86.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation ProtoCompilers SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Immutable.dll System.Console.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.dll System.IO.Pipes.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reflection.Metadata.dll System.Security.AccessControl.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.Windows.dll System.Spatial.dll System.Text.Encoding.CodePages.dll System.Threading.Thread.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.ColorLib.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BootScreen.exe Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.Pulse.dll Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll VBCSCompiler.exe csc.exe csc.exe.config csi.exe mscoree.dll msvcp140d.dll ucrtbased.dll vbc.exe vcruntime140.dll vcruntime140d.dll"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Build.Tasks.CodeAnalysis.dll Microsoft.CodeAnalysis.CSharp.Scripting.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.CodeAnalysis.Scripting.dll Microsoft.CodeAnalysis.VisualBasic.dll Microsoft.CodeAnalysis.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.DiaSymReader.Native.amd64.dll Microsoft.DiaSymReader.Native.x86.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Immutable.dll System.Console.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.dll System.IO.Pipes.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reflection.Metadata.dll System.Security.AccessControl.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.Windows.dll System.Spatial.dll System.Text.Encoding.CodePages.dll System.Threading.Thread.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.ColorLib.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BootScreen.exe Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.Pulse.dll Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll VBCSCompiler.exe csc.exe csc.exe.config csi.exe mscoree.dll msvcp140d.dll protoc.exe protoc1.0M4.jar protocc.exe ucrtbased.dll vbc.exe vcruntime140.dll vcruntime140d.dll"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -456,7 +458,7 @@
     <ROW File="Tango.PPC.WatchDog.exe.config" Component_="CommandLine.xml" FileName="TANGO~11.CON|Tango.PPC.WatchDog.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.WatchDog.exe.config" SelfReg="false" NextFile="Tango.PPC.WatchDog.pdb"/>
     <ROW File="Tango.PPC.WatchDog.pdb" Component_="Tango.PPC.WatchDog.exe" FileName="TANGO~12.PDB|Tango.PPC.WatchDog.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.WatchDog.pdb" SelfReg="false" NextFile="Tango.Scripting.dll"/>
     <ROW File="Tango.Pulse.dll" Component_="Tango.Pulse.dll" FileName="TANGOP~5.DLL|Tango.Pulse.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Pulse.dll" SelfReg="false" NextFile="Tango.Pulse.pdb"/>
-    <ROW File="Tango.Pulse.pdb" Component_="Tango.Pulse.dll" FileName="TANGOP~6.PDB|Tango.Pulse.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Pulse.pdb" SelfReg="false"/>
+    <ROW File="Tango.Pulse.pdb" Component_="Tango.Pulse.dll" FileName="TANGOP~6.PDB|Tango.Pulse.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Pulse.pdb" SelfReg="false" NextFile="protoc1.0M4.jar"/>
     <ROW File="Tango.SQLExaminer.dll" Component_="Tango.SQLExaminer.dll" FileName="TANGOS~5.DLL|Tango.SQLExaminer.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.SQLExaminer.dll" SelfReg="false" NextFile="Tango.SQLExaminer.pdb"/>
     <ROW File="Tango.SQLExaminer.pdb" Component_="Tango.SQLExaminer.dll" FileName="TANGOS~5.PDB|Tango.SQLExaminer.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.SQLExaminer.pdb" SelfReg="false" NextFile="Tango.TFS.dll"/>
     <ROW File="Tango.Scripting.dll" Component_="Tango.Scripting.dll" FileName="TANGOS~1.DLL|Tango.Scripting.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Scripting.dll" SelfReg="false" NextFile="Tango.Scripting.dll.config"/>
@@ -495,6 +497,9 @@
     <ROW File="csi.rsp" Component_="csc.exe.config" FileName="csi.rsp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csi.rsp" SelfReg="false" NextFile="Microsoft.Build.Tasks.CodeAnalysis.dll"/>
     <ROW File="mscoree.dll" Component_="mscoree.dll" FileName="mscoree.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\mscoree.dll" SelfReg="false" NextFile="msvcp140d.dll"/>
     <ROW File="msvcp140d.dll" Component_="msvcp140d.dll" FileName="MSVCP1~1.DLL|msvcp140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\msvcp140d.dll" SelfReg="false" NextFile="Newtonsoft.Json.dll"/>
+    <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc.exe" SelfReg="false" DigSign="true"/>
+    <ROW File="protoc1.0M4.jar" Component_="protoc1.0M4.jar" FileName="PROTOC~1.JAR|protoc-1.0M4.jar" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc-1.0M4.jar" SelfReg="false" NextFile="protocc.exe"/>
+    <ROW File="protocc.exe" Component_="protocc.exe" FileName="protoc-c.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc-c.exe" SelfReg="false" NextFile="protoc.exe" DigSign="true"/>
     <ROW File="ucrtbased.dll" Component_="ucrtbased.dll" FileName="UCRTBA~1.DLL|ucrtbased.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ucrtbased.dll" SelfReg="false" NextFile="vcruntime140.dll"/>
     <ROW File="vbc.exe" Component_="vbc.exe" FileName="vbc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.exe" SelfReg="false" NextFile="vbc.exe.config" DigSign="true"/>
     <ROW File="vbc.exe.config" Component_="csc.exe.config" FileName="VBCEXE~1.CON|vbc.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.exe.config" SelfReg="false" NextFile="vbc.rsp"/>
@@ -510,7 +515,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.26"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.27"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -577,7 +582,6 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
-    <ROW Directory_="ProtoCompilers_Dir" Component_="ProtoCompilers" ManualDelete="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/CaptureConfig.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/CaptureConfig.cs
index 0b74f2b3f..730665263 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/CaptureConfig.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Models/CaptureConfig.cs
@@ -110,6 +110,13 @@ namespace Tango.MachineStudio.ColorCapture.Models
             set { _enforceBarcodeDetection = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _performCLAHE;
+        public bool PerformCLAHE
+        {
+            get { return _performCLAHE; }
+            set { _performCLAHE = value; RaisePropertyChangedAuto(); }
+        }
+
 
         public CaptureConfig()
         {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
index 93fe776bc..2cf3ed63f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/ViewModels/MainViewVM.cs
@@ -548,6 +548,7 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels
                     HistogramMethod = Config.HistogramComparison,
                     EnableDoubleChecking = Config.EnableDoubleChecking,
                     EnforceBarcodeDetection = Config.EnforceBarcodeDetection,
+                    PerformCLAHE = Config.PerformCLAHE,
                 });
 
                 if (result.Similarity > 0)
@@ -784,7 +785,11 @@ namespace Tango.MachineStudio.ColorCapture.ViewModels
                 if (EmulatedColors != null)
                 {
                     var source = View.GetViewportImage();
-                    PerformDetection(source);
+
+                    if (source != null)
+                    {
+                        PerformDetection(source);
+                    }
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
index bd26ff008..96e5fc488 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml
@@ -48,7 +48,7 @@
     </UserControl.Resources>
 
     <Grid Margin="20">
-        <TabControl Background="{StaticResource Background}" Foreground="{StaticResource Foreground}">
+        <TabControl x:Name="tabControl" Background="{StaticResource Background}" Foreground="{StaticResource Foreground}">
             <TabControl.Resources>
                 <Style TargetType="TabPanel">
                     <Setter Property="HorizontalAlignment" Value="Center"/>
@@ -238,7 +238,7 @@
                                     </Grid>
 
                                     <!--{Binding CaptureMode,Converter={StaticResource CaptureModeToVisibilityConverter},ConverterParameter={x:Static global:CaptureMode.Emulated3D}}-->
-                                    <Grid Visibility="Visible">
+                                    <Grid Visibility="{Binding CaptureMode,Converter={StaticResource CaptureModeToVisibilityConverter},ConverterParameter={x:Static global:CaptureMode.Emulated3D}}">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="60"/>
                                             <RowDefinition Height="1*"/>
@@ -814,6 +814,7 @@
                             <RowDefinition Height="40"/>
                             <RowDefinition Height="40"/>
                             <RowDefinition Height="40"/>
+                            <RowDefinition Height="40"/>
                         </Grid.RowDefinitions>
 
                         <TextBlock VerticalAlignment="Bottom" Height="27">Columns</TextBlock>
@@ -872,6 +873,9 @@
 
                         <TextBlock Grid.Row="13" Grid.Column="0" VerticalAlignment="Bottom" Height="27">Enforce Barcode Detection</TextBlock>
                         <ToggleButton IsChecked="{Binding Config.EnforceBarcodeDetection}" Grid.Row="13" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom"></ToggleButton>
+
+                        <TextBlock Grid.Row="14" Grid.Column="0" VerticalAlignment="Bottom" Height="27">Perform CLAHE</TextBlock>
+                        <ToggleButton IsChecked="{Binding Config.PerformCLAHE}" Grid.Row="14" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom"></ToggleButton>
                     </Grid>
                 </Border>
             </TabItem>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
index a35adaa23..2759b44dc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorCapture/Views/MainView.xaml.cs
@@ -88,12 +88,47 @@ namespace Tango.MachineStudio.ColorCapture.Views
 
         public BitmapSource GetViewportImage()
         {
-            MemoryStream ms = new MemoryStream();
-            Viewport3DHelper.SaveBitmap(viewport.Viewport, ms, null, 1, BitmapExporter.OutputFormat.Bmp);
-            ms.Position = 0;
-            var source = ms.ToArray().ToBitmapSource();
-            ms.Dispose();
-            return source;
+            try
+            {
+                if (_vm.CaptureMode == CaptureMode.Emulated3D && tabControl.SelectedIndex == 0)
+                {
+                    var location = viewport.Viewport.PointToScreen(new Point(0, 0));
+                    var size = new Size(viewport.Viewport.ActualWidth, viewport.Viewport.ActualHeight);
+
+                    using (System.Drawing.Bitmap bmp = new System.Drawing.Bitmap((int)size.Width, (int)size.Height))
+                    {
+                        using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bmp))
+                        {
+                            g.CopyFromScreen((int)location.X, (int)location.Y, 0, 0, bmp.Size);
+                        }
+
+                        bmp.Save("D:\\Test\\ttt.bmp");
+
+                        using (MemoryStream ms = new MemoryStream())
+                        {
+                            bmp.Save(ms, System.Drawing.Imaging.ImageFormat.Bmp);
+                            ms.Position = 0;
+                            var source = ms.ToArray().ToBitmapSource();
+                            return source;
+                        }
+                    }
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine(ex.Message);
+                return null;
+            }
+            //MemoryStream ms = new MemoryStream();
+            //Viewport3DHelper.SaveBitmap(viewport.Viewport, ms, null, 1, BitmapExporter.OutputFormat.Bmp);
+            //ms.Position = 0;
+            //var source = ms.ToArray().ToBitmapSource();
+            //ms.Dispose();
+            //return source;
         }
 
         private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 2ad5765f0..89fde22d0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.26.0")]
+[assembly: AssemblyVersion("1.0.27.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.BL/CardDetectionConfig.cs b/Software/Visual_Studio/TCC/Tango.TCC.BL/CardDetectionConfig.cs
index b2b2bc197..f940ad5b3 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.BL/CardDetectionConfig.cs
+++ b/Software/Visual_Studio/TCC/Tango.TCC.BL/CardDetectionConfig.cs
@@ -20,6 +20,7 @@ namespace Tango.TCC.BL
         public CardDetectionHistogramMethods HistogramMethod { get; set; }
         public bool EnableDoubleChecking { get; set; }
         public bool EnforceBarcodeDetection { get; set; }
+        public bool PerformCLAHE { get; set; }
 
         public CardDetectionConfig()
         {
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.BL/CardDetector.cs b/Software/Visual_Studio/TCC/Tango.TCC.BL/CardDetector.cs
index 221659868..a48b2cf51 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.BL/CardDetector.cs
+++ b/Software/Visual_Studio/TCC/Tango.TCC.BL/CardDetector.cs
@@ -1,6 +1,7 @@
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -8,6 +9,7 @@ using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Tango.Core.Helpers;
+using Tango.Core.Threading;
 using Tango.PMR.TCC;
 
 namespace Tango.TCC.BL
@@ -18,6 +20,7 @@ namespace Tango.TCC.BL
         private static byte[] _defaultTemplate;
         private static List<DetectionBenchmark> _defaultBenchmarks;
         private byte[] _sourceBitmapBytes;
+        private ActionTimer _releaseTimer;
 
         private bool _canDetect;
         public bool CanDetect
@@ -28,6 +31,8 @@ namespace Tango.TCC.BL
 
         public CardDetector()
         {
+            _releaseTimer = new ActionTimer(TimeSpan.FromSeconds(5000));
+
             if (_defaultTemplate == null)
             {
                 _defaultTemplate = File.ReadAllBytes(AssemblyHelper.GetCurrentAssemblyFolder() + "\\TCC\\template.bmp");
@@ -47,6 +52,11 @@ namespace Tango.TCC.BL
 
             CanDetect = false;
 
+            _releaseTimer.ResetReplace(() =>
+            {
+                CanDetect = true;
+            });
+
             var cloned = source.Clone();
             cloned.Freeze();
 
@@ -67,6 +77,7 @@ namespace Tango.TCC.BL
                     HistogramMethod = (int)config.HistogramMethod,
                     EnableDoubleChecking = config.EnableDoubleChecking,
                     EnforceBarcodeDetection = config.EnforceBarcodeDetection,
+                    PerformCLAHE = config.PerformCLAHE,
                 });
 
                 detectionResult.Similarity = result.Similarity;
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetection.cpp b/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetection.cpp
index 25b523e58..fff707abd 100644
Binary files a/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetection.cpp and b/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetection.cpp differ
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetection.h b/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetection.h
index 0f1a87d45..3f276d27a 100644
Binary files a/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetection.h and b/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetection.h differ
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetectionConfig.h b/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetectionConfig.h
index 90f3239be..3b6a5d4a7 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetectionConfig.h
+++ b/Software/Visual_Studio/TCC/Tango.TCC.CardDetector/CardDetectionConfig.h
@@ -18,6 +18,7 @@ namespace Tango
 				property int HistogramMethod;
 				property bool EnableDoubleChecking;
 				property bool EnforceBarcodeDetection;
+				property bool PerformCLAHE;
 			};
 		}
 	}
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/ColorDetection.cpp b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/ColorDetection.cpp
index 1df7a14df..016854272 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/ColorDetection.cpp
+++ b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/ColorDetection.cpp
@@ -1,19 +1,4 @@
-#include "DetectionInput.pb-c.h"
-#include "DetectionOutput.pb-c.h"
-#include "DetectionColor.pb-c.h"
-#include "stdafx.h"
 #include "ColorDetection.h"
-#include "Detect.h"
-#include "BhBlocks.h"
-#include <opencv2/opencv.hpp>
-#include "bitmap_image.hpp"
-#include "Utils.h"
-#include  <stdio.h>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
 #include "ColorDetectionMirta.h"
 
 ColorDetection::ColorDetection()
@@ -26,10 +11,9 @@ ColorDetection::~ColorDetection()
 }
 
 size_t ColorDetection::DetectColorNew(uint8_t * input_buffer, size_t input_buffer_size, uint8_t *& output_buffer)
-//includes  CallDettectColor (old version)
 {
 	try
-	{
+	{ 
 		//Init input.
 		DetectionInput* detectionInput = NULL;
 		detectionInput = (DetectionInput*)malloc(sizeof(DetectionInput));
@@ -46,6 +30,12 @@ size_t ColorDetection::DetectColorNew(uint8_t * input_buffer, size_t input_buffe
 		bitmap_image bitmap(detectionInput->bitmap.data, detectionInput->bitmap.len);
 		Mat img = Mat(bitmap.height(), bitmap.width(), CV_8UC3, bitmap.data());
 
+		//Perform CLAHE
+		if (detectionInput->performclahe)
+		{
+			img = performCLAHE(img);
+		}
+
 		int rows = detectionInput->rows; //Number or rows in card.
 		int columns = detectionInput->columns; // Number of columns in card.
 
@@ -80,7 +70,7 @@ size_t ColorDetection::DetectColorNew(uint8_t * input_buffer, size_t input_buffe
 			}
 		}
 
-		//Get target rectangle mean (card hole).
+		//Get target rectangle mean (card hole). 
 		Rect target_rect = Utils::cropRect(rects[detectionInput->targetindex], Size(rect_size, rect_size));
 		Scalar target_mean = means[detectionInput->targetindex];
 
@@ -128,21 +118,12 @@ size_t ColorDetection::DetectColorNew(uint8_t * input_buffer, size_t input_buffe
 		//Put original target color.
 		detectionOutput->rawcolor = initDetectionColor((int)target_mean.val[2], (int)target_mean.val[1], (int)target_mean.val[0]);
 
-		//Get benchmarks...
-		detectionInput->benchmarks[0]->red;
-		detectionInput->benchmarks[0]->l;
-
 		//Put processed target color.
-
 		ColorDetectionMirta mirtaDetection;
-		//ColorDetectionMirta was ColorDetection
-		// Detect was DetectColor
+
 		DetectionColor* result = mirtaDetection.CDetect(detectionInput->benchmarks, means, detectionInput->columns, detectionInput->rows, detectionInput->targetindex);
 		detectionOutput->processedcolor = result;
 
-		detectionOutput->has_number = true;
-		detectionOutput->number = detectionInput->number + 10;
-
 		//Process --------------------------------------------------------------------------------------------
 
 
@@ -216,3 +197,31 @@ DetectionColor* ColorDetection::initDetectionColor(int r, int g, int b)
 	return color;
 }
 
+Mat ColorDetection::performCLAHE(Mat source)
+{
+	// READ RGB color image and convert it to Lab
+	cv::Mat bgr_image = source;
+	cv::Mat lab_image;
+	cv::cvtColor(bgr_image, lab_image, CV_BGR2Lab);
+
+	// Extract the L channel
+	std::vector<cv::Mat> lab_planes(3);
+	cv::split(lab_image, lab_planes);  // now we have the L image in lab_planes[0]
+
+	// apply the CLAHE algorithm to the L channel
+	cv::Ptr<cv::CLAHE> clahe = cv::createCLAHE();
+	clahe->setClipLimit(4);
+	cv::Mat dst;
+	clahe->apply(lab_planes[0], dst);
+
+	// Merge the the color planes back into an Lab image
+	dst.copyTo(lab_planes[0]);
+	cv::merge(lab_planes, lab_image);
+
+	// convert back to RGB
+	cv::Mat image_clahe;
+	cv::cvtColor(lab_image, image_clahe, CV_Lab2BGR);
+
+	return image_clahe;
+}
+
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/ColorDetection.h b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/ColorDetection.h
index 56b008a32..16bfe731b 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/ColorDetection.h
+++ b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/ColorDetection.h
@@ -1,6 +1,18 @@
 #pragma once
 
+#include "DetectionInput.pb-c.h"
+#include "DetectionOutput.pb-c.h"
 #include "DetectionColor.pb-c.h"
+#include "stdafx.h"
+#include "Detect.h"
+#include "BhBlocks.h"
+#include <opencv2/opencv.hpp>
+#include "bitmap_image.hpp"
+#include "Utils.h"
+#include  <stdio.h>
+#include <fstream>
+#include <iostream>
+#include <sstream>
 #include <string>
 #include <vector>
 
@@ -9,8 +21,7 @@ class ColorDetection
 private:
 	bool isRectFiducial(int index, int columns, int rows);
 	DetectionColor* initDetectionColor(int r, int g, int b);
-	int m_totSize;
-	int m_interpPoints;
+	Mat performCLAHE(Mat source);
 public:
 	ColorDetection();
 	~ColorDetection();
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionInput.pb-c.c b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionInput.pb-c.c
index 9fe7f574f..af1df5858 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionInput.pb-c.c
+++ b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionInput.pb-c.c
@@ -139,12 +139,12 @@ static const ProtobufCFieldDescriptor detection_input__field_descriptors[8] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "number",
-    10,
+    "PerformCLAHE",
+    8,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(DetectionInput, has_number),
-    offsetof(DetectionInput, number),
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(DetectionInput, has_performclahe),
+    offsetof(DetectionInput, performclahe),
     NULL,
     NULL,
     0,             /* flags */
@@ -155,16 +155,15 @@ static const unsigned detection_input__field_indices_by_name[] = {
   6,   /* field[6] = Benchmarks */
   0,   /* field[0] = Bitmap */
   1,   /* field[1] = Columns */
+  7,   /* field[7] = PerformCLAHE */
   5,   /* field[5] = RequestColorMatrix */
   4,   /* field[4] = RequestDebugImage */
   2,   /* field[2] = Rows */
   3,   /* field[3] = TargetIndex */
-  7,   /* field[7] = number */
 };
-static const ProtobufCIntRange detection_input__number_ranges[2 + 1] =
+static const ProtobufCIntRange detection_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 10, 7 },
   { 0, 8 }
 };
 const ProtobufCMessageDescriptor detection_input__descriptor =
@@ -178,7 +177,7 @@ const ProtobufCMessageDescriptor detection_input__descriptor =
   8,
   detection_input__field_descriptors,
   detection_input__field_indices_by_name,
-  2,  detection_input__number_ranges,
+  1,  detection_input__number_ranges,
   (ProtobufCMessageInit) detection_input__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionInput.pb-c.h b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionInput.pb-c.h
index 7986b70fd..8b157601c 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionInput.pb-c.h
+++ b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionInput.pb-c.h
@@ -41,8 +41,8 @@ struct  _DetectionInput
   protobuf_c_boolean requestcolormatrix;
   size_t n_benchmarks;
   DetectionBenchmark **benchmarks;
-  protobuf_c_boolean has_number;
-  double number;
+  protobuf_c_boolean has_performclahe;
+  protobuf_c_boolean performclahe;
 };
 #define DETECTION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&detection_input__descriptor) \
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionOutput.pb-c.c b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionOutput.pb-c.c
index 1eb5c194c..fdc769cfa 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionOutput.pb-c.c
+++ b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionOutput.pb-c.c
@@ -52,23 +52,11 @@ void   detection_output__free_unpacked
   assert(message->base.descriptor == &detection_output__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor detection_output__field_descriptors[7] =
+static const ProtobufCFieldDescriptor detection_output__field_descriptors[6] =
 {
-  {
-    "number",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(DetectionOutput, has_number),
-    offsetof(DetectionOutput, number),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
   {
     "RawColor",
-    2,
+    1,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -80,7 +68,7 @@ static const ProtobufCFieldDescriptor detection_output__field_descriptors[7] =
   },
   {
     "ProcessedColor",
-    3,
+    2,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -92,7 +80,7 @@ static const ProtobufCFieldDescriptor detection_output__field_descriptors[7] =
   },
   {
     "DebugBitmap",
-    4,
+    3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BYTES,
     offsetof(DetectionOutput, has_debugbitmap),
@@ -104,7 +92,7 @@ static const ProtobufCFieldDescriptor detection_output__field_descriptors[7] =
   },
   {
     "ColorMatrix",
-    5,
+    4,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
     offsetof(DetectionOutput, n_colormatrix),
@@ -116,7 +104,7 @@ static const ProtobufCFieldDescriptor detection_output__field_descriptors[7] =
   },
   {
     "HasError",
-    6,
+    5,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
     offsetof(DetectionOutput, has_haserror),
@@ -128,7 +116,7 @@ static const ProtobufCFieldDescriptor detection_output__field_descriptors[7] =
   },
   {
     "ErrorMessage",
-    7,
+    6,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
@@ -140,18 +128,17 @@ static const ProtobufCFieldDescriptor detection_output__field_descriptors[7] =
   },
 };
 static const unsigned detection_output__field_indices_by_name[] = {
-  4,   /* field[4] = ColorMatrix */
-  3,   /* field[3] = DebugBitmap */
-  6,   /* field[6] = ErrorMessage */
-  5,   /* field[5] = HasError */
-  2,   /* field[2] = ProcessedColor */
-  1,   /* field[1] = RawColor */
-  0,   /* field[0] = number */
+  3,   /* field[3] = ColorMatrix */
+  2,   /* field[2] = DebugBitmap */
+  5,   /* field[5] = ErrorMessage */
+  4,   /* field[4] = HasError */
+  1,   /* field[1] = ProcessedColor */
+  0,   /* field[0] = RawColor */
 };
 static const ProtobufCIntRange detection_output__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 7 }
+  { 0, 6 }
 };
 const ProtobufCMessageDescriptor detection_output__descriptor =
 {
@@ -161,7 +148,7 @@ const ProtobufCMessageDescriptor detection_output__descriptor =
   "DetectionOutput",
   "",
   sizeof(DetectionOutput),
-  7,
+  6,
   detection_output__field_descriptors,
   detection_output__field_indices_by_name,
   1,  detection_output__number_ranges,
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionOutput.pb-c.h b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionOutput.pb-c.h
index c9789eba0..9e64064cf 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionOutput.pb-c.h
+++ b/Software/Visual_Studio/TCC/Tango.TCC.ColorDetector/PMR/TCC/DetectionOutput.pb-c.h
@@ -27,8 +27,6 @@ typedef struct _DetectionOutput DetectionOutput;
 struct  _DetectionOutput
 {
   ProtobufCMessage base;
-  protobuf_c_boolean has_number;
-  double number;
   DetectionColor *rawcolor;
   DetectionColor *processedcolor;
   protobuf_c_boolean has_debugbitmap;
@@ -41,7 +39,7 @@ struct  _DetectionOutput
 };
 #define DETECTION_OUTPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&detection_output__descriptor) \
-    , 0, 0, NULL, NULL, 0, {0,NULL}, 0,NULL, 0, 0, NULL }
+    , NULL, NULL, 0, {0,NULL}, 0,NULL, 0, 0, NULL }
 
 
 /* DetectionOutput methods */
diff --git a/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs b/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs
index fe79cf16d..2ad2b4fea 100644
--- a/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs
+++ b/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs
@@ -115,7 +115,7 @@ namespace Tango.TCC.Service.Controllers
             {
                 using (Bitmap bmp = new Bitmap(ms))
                 {
-                    if (bmp.PixelFormat != System.Drawing.Imaging.PixelFormat.Format24bppRgb)
+                    if (bmp.PixelFormat != PixelFormat.Format24bppRgb)
                     {
                         using (Bitmap bmp24 = bmp.ConvertTo24Bit())
                         {
diff --git a/Software/Visual_Studio/Tango.PMR/TCC/DetectionInput.cs b/Software/Visual_Studio/Tango.PMR/TCC/DetectionInput.cs
index 8a24008ad..32d9b142a 100644
--- a/Software/Visual_Studio/Tango.PMR/TCC/DetectionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/TCC/DetectionInput.cs
@@ -23,16 +23,17 @@ namespace Tango.PMR.TCC {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChREZXRlY3Rpb25JbnB1dC5wcm90bxINVGFuZ28uUE1SLlRDQxoYRGV0ZWN0",
-            "aW9uQmVuY2htYXJrLnByb3RvItIBCg5EZXRlY3Rpb25JbnB1dBIOCgZCaXRt",
+            "aW9uQmVuY2htYXJrLnByb3RvItgBCg5EZXRlY3Rpb25JbnB1dBIOCgZCaXRt",
             "YXAYASABKAwSDwoHQ29sdW1ucxgCIAEoBRIMCgRSb3dzGAMgASgFEhMKC1Rh",
             "cmdldEluZGV4GAQgASgFEhkKEVJlcXVlc3REZWJ1Z0ltYWdlGAUgASgIEhoK",
             "ElJlcXVlc3RDb2xvck1hdHJpeBgGIAEoCBI1CgpCZW5jaG1hcmtzGAcgAygL",
-            "MiEuVGFuZ28uUE1SLlRDQy5EZXRlY3Rpb25CZW5jaG1hcmsSDgoGbnVtYmVy",
-            "GAogASgBQhkKF2NvbS50d2luZS50YW5nby5wbXIudGNjYgZwcm90bzM="));
+            "MiEuVGFuZ28uUE1SLlRDQy5EZXRlY3Rpb25CZW5jaG1hcmsSFAoMUGVyZm9y",
+            "bUNMQUhFGAggASgIQhkKF2NvbS50d2luZS50YW5nby5wbXIudGNjYgZwcm90",
+            "bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.TCC.DetectionBenchmarkReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.TCC.DetectionInput), global::Tango.PMR.TCC.DetectionInput.Parser, new[]{ "Bitmap", "Columns", "Rows", "TargetIndex", "RequestDebugImage", "RequestColorMatrix", "Benchmarks", "Number" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.TCC.DetectionInput), global::Tango.PMR.TCC.DetectionInput.Parser, new[]{ "Bitmap", "Columns", "Rows", "TargetIndex", "RequestDebugImage", "RequestColorMatrix", "Benchmarks", "PerformCLAHE" }, null, null, null)
           }));
     }
     #endregion
@@ -70,7 +71,7 @@ namespace Tango.PMR.TCC {
       requestDebugImage_ = other.requestDebugImage_;
       requestColorMatrix_ = other.requestColorMatrix_;
       benchmarks_ = other.benchmarks_.Clone();
-      number_ = other.number_;
+      performCLAHE_ = other.performCLAHE_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -154,14 +155,14 @@ namespace Tango.PMR.TCC {
       get { return benchmarks_; }
     }
 
-    /// <summary>Field number for the "number" field.</summary>
-    public const int NumberFieldNumber = 10;
-    private double number_;
+    /// <summary>Field number for the "PerformCLAHE" field.</summary>
+    public const int PerformCLAHEFieldNumber = 8;
+    private bool performCLAHE_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double Number {
-      get { return number_; }
+    public bool PerformCLAHE {
+      get { return performCLAHE_; }
       set {
-        number_ = value;
+        performCLAHE_ = value;
       }
     }
 
@@ -185,7 +186,7 @@ namespace Tango.PMR.TCC {
       if (RequestDebugImage != other.RequestDebugImage) return false;
       if (RequestColorMatrix != other.RequestColorMatrix) return false;
       if(!benchmarks_.Equals(other.benchmarks_)) return false;
-      if (Number != other.Number) return false;
+      if (PerformCLAHE != other.PerformCLAHE) return false;
       return true;
     }
 
@@ -199,7 +200,7 @@ namespace Tango.PMR.TCC {
       if (RequestDebugImage != false) hash ^= RequestDebugImage.GetHashCode();
       if (RequestColorMatrix != false) hash ^= RequestColorMatrix.GetHashCode();
       hash ^= benchmarks_.GetHashCode();
-      if (Number != 0D) hash ^= Number.GetHashCode();
+      if (PerformCLAHE != false) hash ^= PerformCLAHE.GetHashCode();
       return hash;
     }
 
@@ -235,9 +236,9 @@ namespace Tango.PMR.TCC {
         output.WriteBool(RequestColorMatrix);
       }
       benchmarks_.WriteTo(output, _repeated_benchmarks_codec);
-      if (Number != 0D) {
-        output.WriteRawTag(81);
-        output.WriteDouble(Number);
+      if (PerformCLAHE != false) {
+        output.WriteRawTag(64);
+        output.WriteBool(PerformCLAHE);
       }
     }
 
@@ -263,8 +264,8 @@ namespace Tango.PMR.TCC {
         size += 1 + 1;
       }
       size += benchmarks_.CalculateSize(_repeated_benchmarks_codec);
-      if (Number != 0D) {
-        size += 1 + 8;
+      if (PerformCLAHE != false) {
+        size += 1 + 1;
       }
       return size;
     }
@@ -293,8 +294,8 @@ namespace Tango.PMR.TCC {
         RequestColorMatrix = other.RequestColorMatrix;
       }
       benchmarks_.Add(other.benchmarks_);
-      if (other.Number != 0D) {
-        Number = other.Number;
+      if (other.PerformCLAHE != false) {
+        PerformCLAHE = other.PerformCLAHE;
       }
     }
 
@@ -334,8 +335,8 @@ namespace Tango.PMR.TCC {
             benchmarks_.AddEntriesFrom(input, _repeated_benchmarks_codec);
             break;
           }
-          case 81: {
-            Number = input.ReadDouble();
+          case 64: {
+            PerformCLAHE = input.ReadBool();
             break;
           }
         }
diff --git a/Software/Visual_Studio/Tango.PMR/TCC/DetectionOutput.cs b/Software/Visual_Studio/Tango.PMR/TCC/DetectionOutput.cs
index da712fe87..a9447b09d 100644
--- a/Software/Visual_Studio/Tango.PMR/TCC/DetectionOutput.cs
+++ b/Software/Visual_Studio/Tango.PMR/TCC/DetectionOutput.cs
@@ -23,17 +23,17 @@ namespace Tango.PMR.TCC {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChVEZXRlY3Rpb25PdXRwdXQucHJvdG8SDVRhbmdvLlBNUi5UQ0MaFERldGVj",
-            "dGlvbkNvbG9yLnByb3RvIvoBCg9EZXRlY3Rpb25PdXRwdXQSDgoGbnVtYmVy",
-            "GAEgASgBEi8KCFJhd0NvbG9yGAIgASgLMh0uVGFuZ28uUE1SLlRDQy5EZXRl",
-            "Y3Rpb25Db2xvchI1Cg5Qcm9jZXNzZWRDb2xvchgDIAEoCzIdLlRhbmdvLlBN",
-            "Ui5UQ0MuRGV0ZWN0aW9uQ29sb3ISEwoLRGVidWdCaXRtYXAYBCABKAwSMgoL",
-            "Q29sb3JNYXRyaXgYBSADKAsyHS5UYW5nby5QTVIuVENDLkRldGVjdGlvbkNv",
-            "bG9yEhAKCEhhc0Vycm9yGAYgASgIEhQKDEVycm9yTWVzc2FnZRgHIAEoCUIZ",
-            "Chdjb20udHdpbmUudGFuZ28ucG1yLnRjY2IGcHJvdG8z"));
+            "dGlvbkNvbG9yLnByb3RvIuoBCg9EZXRlY3Rpb25PdXRwdXQSLwoIUmF3Q29s",
+            "b3IYASABKAsyHS5UYW5nby5QTVIuVENDLkRldGVjdGlvbkNvbG9yEjUKDlBy",
+            "b2Nlc3NlZENvbG9yGAIgASgLMh0uVGFuZ28uUE1SLlRDQy5EZXRlY3Rpb25D",
+            "b2xvchITCgtEZWJ1Z0JpdG1hcBgDIAEoDBIyCgtDb2xvck1hdHJpeBgEIAMo",
+            "CzIdLlRhbmdvLlBNUi5UQ0MuRGV0ZWN0aW9uQ29sb3ISEAoISGFzRXJyb3IY",
+            "BSABKAgSFAoMRXJyb3JNZXNzYWdlGAYgASgJQhkKF2NvbS50d2luZS50YW5n",
+            "by5wbXIudGNjYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.TCC.DetectionColorReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.TCC.DetectionOutput), global::Tango.PMR.TCC.DetectionOutput.Parser, new[]{ "Number", "RawColor", "ProcessedColor", "DebugBitmap", "ColorMatrix", "HasError", "ErrorMessage" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.TCC.DetectionOutput), global::Tango.PMR.TCC.DetectionOutput.Parser, new[]{ "RawColor", "ProcessedColor", "DebugBitmap", "ColorMatrix", "HasError", "ErrorMessage" }, null, null, null)
           }));
     }
     #endregion
@@ -64,7 +64,6 @@ namespace Tango.PMR.TCC {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public DetectionOutput(DetectionOutput other) : this() {
-      number_ = other.number_;
       RawColor = other.rawColor_ != null ? other.RawColor.Clone() : null;
       ProcessedColor = other.processedColor_ != null ? other.ProcessedColor.Clone() : null;
       debugBitmap_ = other.debugBitmap_;
@@ -78,19 +77,8 @@ namespace Tango.PMR.TCC {
       return new DetectionOutput(this);
     }
 
-    /// <summary>Field number for the "number" field.</summary>
-    public const int NumberFieldNumber = 1;
-    private double number_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double Number {
-      get { return number_; }
-      set {
-        number_ = value;
-      }
-    }
-
     /// <summary>Field number for the "RawColor" field.</summary>
-    public const int RawColorFieldNumber = 2;
+    public const int RawColorFieldNumber = 1;
     private global::Tango.PMR.TCC.DetectionColor rawColor_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public global::Tango.PMR.TCC.DetectionColor RawColor {
@@ -101,7 +89,7 @@ namespace Tango.PMR.TCC {
     }
 
     /// <summary>Field number for the "ProcessedColor" field.</summary>
-    public const int ProcessedColorFieldNumber = 3;
+    public const int ProcessedColorFieldNumber = 2;
     private global::Tango.PMR.TCC.DetectionColor processedColor_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public global::Tango.PMR.TCC.DetectionColor ProcessedColor {
@@ -112,7 +100,7 @@ namespace Tango.PMR.TCC {
     }
 
     /// <summary>Field number for the "DebugBitmap" field.</summary>
-    public const int DebugBitmapFieldNumber = 4;
+    public const int DebugBitmapFieldNumber = 3;
     private pb::ByteString debugBitmap_ = pb::ByteString.Empty;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public pb::ByteString DebugBitmap {
@@ -123,9 +111,9 @@ namespace Tango.PMR.TCC {
     }
 
     /// <summary>Field number for the "ColorMatrix" field.</summary>
-    public const int ColorMatrixFieldNumber = 5;
+    public const int ColorMatrixFieldNumber = 4;
     private static readonly pb::FieldCodec<global::Tango.PMR.TCC.DetectionColor> _repeated_colorMatrix_codec
-        = pb::FieldCodec.ForMessage(42, global::Tango.PMR.TCC.DetectionColor.Parser);
+        = pb::FieldCodec.ForMessage(34, global::Tango.PMR.TCC.DetectionColor.Parser);
     private readonly pbc::RepeatedField<global::Tango.PMR.TCC.DetectionColor> colorMatrix_ = new pbc::RepeatedField<global::Tango.PMR.TCC.DetectionColor>();
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public pbc::RepeatedField<global::Tango.PMR.TCC.DetectionColor> ColorMatrix {
@@ -133,7 +121,7 @@ namespace Tango.PMR.TCC {
     }
 
     /// <summary>Field number for the "HasError" field.</summary>
-    public const int HasErrorFieldNumber = 6;
+    public const int HasErrorFieldNumber = 5;
     private bool hasError_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public bool HasError {
@@ -144,7 +132,7 @@ namespace Tango.PMR.TCC {
     }
 
     /// <summary>Field number for the "ErrorMessage" field.</summary>
-    public const int ErrorMessageFieldNumber = 7;
+    public const int ErrorMessageFieldNumber = 6;
     private string errorMessage_ = "";
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public string ErrorMessage {
@@ -167,7 +155,6 @@ namespace Tango.PMR.TCC {
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (Number != other.Number) return false;
       if (!object.Equals(RawColor, other.RawColor)) return false;
       if (!object.Equals(ProcessedColor, other.ProcessedColor)) return false;
       if (DebugBitmap != other.DebugBitmap) return false;
@@ -180,7 +167,6 @@ namespace Tango.PMR.TCC {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      if (Number != 0D) hash ^= Number.GetHashCode();
       if (rawColor_ != null) hash ^= RawColor.GetHashCode();
       if (processedColor_ != null) hash ^= ProcessedColor.GetHashCode();
       if (DebugBitmap.Length != 0) hash ^= DebugBitmap.GetHashCode();
@@ -197,29 +183,25 @@ namespace Tango.PMR.TCC {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      if (Number != 0D) {
-        output.WriteRawTag(9);
-        output.WriteDouble(Number);
-      }
       if (rawColor_ != null) {
-        output.WriteRawTag(18);
+        output.WriteRawTag(10);
         output.WriteMessage(RawColor);
       }
       if (processedColor_ != null) {
-        output.WriteRawTag(26);
+        output.WriteRawTag(18);
         output.WriteMessage(ProcessedColor);
       }
       if (DebugBitmap.Length != 0) {
-        output.WriteRawTag(34);
+        output.WriteRawTag(26);
         output.WriteBytes(DebugBitmap);
       }
       colorMatrix_.WriteTo(output, _repeated_colorMatrix_codec);
       if (HasError != false) {
-        output.WriteRawTag(48);
+        output.WriteRawTag(40);
         output.WriteBool(HasError);
       }
       if (ErrorMessage.Length != 0) {
-        output.WriteRawTag(58);
+        output.WriteRawTag(50);
         output.WriteString(ErrorMessage);
       }
     }
@@ -227,9 +209,6 @@ namespace Tango.PMR.TCC {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      if (Number != 0D) {
-        size += 1 + 8;
-      }
       if (rawColor_ != null) {
         size += 1 + pb::CodedOutputStream.ComputeMessageSize(RawColor);
       }
@@ -254,9 +233,6 @@ namespace Tango.PMR.TCC {
       if (other == null) {
         return;
       }
-      if (other.Number != 0D) {
-        Number = other.Number;
-      }
       if (other.rawColor_ != null) {
         if (rawColor_ == null) {
           rawColor_ = new global::Tango.PMR.TCC.DetectionColor();
@@ -289,37 +265,33 @@ namespace Tango.PMR.TCC {
           default:
             input.SkipLastField();
             break;
-          case 9: {
-            Number = input.ReadDouble();
-            break;
-          }
-          case 18: {
+          case 10: {
             if (rawColor_ == null) {
               rawColor_ = new global::Tango.PMR.TCC.DetectionColor();
             }
             input.ReadMessage(rawColor_);
             break;
           }
-          case 26: {
+          case 18: {
             if (processedColor_ == null) {
               processedColor_ = new global::Tango.PMR.TCC.DetectionColor();
             }
             input.ReadMessage(processedColor_);
             break;
           }
-          case 34: {
+          case 26: {
             DebugBitmap = input.ReadBytes();
             break;
           }
-          case 42: {
+          case 34: {
             colorMatrix_.AddEntriesFrom(input, _repeated_colorMatrix_codec);
             break;
           }
-          case 48: {
+          case 40: {
             HasError = input.ReadBool();
             break;
           }
-          case 58: {
+          case 50: {
             ErrorMessage = input.ReadString();
             break;
           }
diff --git a/Software/Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs
index 59237b4a0..c4332a146 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs
+++ b/Software/Visual_Studio/Tango.UnitTesting/TCC/TCC_TST.cs
@@ -32,7 +32,6 @@ namespace Tango.UnitTesting.TCC
             {
                 DetectionInput input = new DetectionInput()
                 {
-                    Number = 5,
                     Columns = 10,
                     Rows = 11,
                     TargetIndex = 99,
@@ -78,8 +77,6 @@ namespace Tango.UnitTesting.TCC
                     }
 
                     Helper.ShowInExplorer(benchmarksCsvFile);
-
-                    Assert.IsTrue(output.Number == 15);
                 }
             }
         }
-- 
cgit v1.3.1


From 8b7a4f49dddb3ff8d57f33c43413c9dc96de7c0e Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 16 May 2019 11:55:03 +0300
Subject: Added SUSPEND_VERSION_UPDATE Added PERFORM_SCHEMA_UPDATE Added
 DEVICE_COM_PORT

fields to DB, MS, PPC.
---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 Software/DB/TCC/TCC.mdf                            | Bin 8388608 -> 8388608 bytes
 Software/DB/TCC/TCC_log.ldf                        | Bin 8388608 -> 8388608 bytes
 .../Views/MachineSettingsView.xaml                 |   9 ++
 .../MachineSetup/MachineSetupManager.cs            |   6 +
 .../MachineUpdate/MachineUpdateManager.cs          |   6 +-
 .../PPC/Tango.PPC.Common/PPCSettings.cs            |   2 +-
 .../Tango.PPC.Common/Web/MachineSetupResponse.cs   |   1 +
 .../PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs   |   1 +
 .../Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs   |  24 ++++
 .../Visual_Studio/Tango.BL/Entities/MachineBase.cs | 114 +++++++++++++++++
 .../Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs   |   3 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             |   9 ++
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     | 140 ++++++++++-----------
 .../Controllers/PPCController.cs                   |  19 +--
 16 files changed, 253 insertions(+), 81 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 3f9ba04a4..182ac1d40 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index c0013d42f..a3691e4b2 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf
index 9d9b81a3d..5982d6e99 100644
Binary files a/Software/DB/TCC/TCC.mdf and b/Software/DB/TCC/TCC.mdf differ
diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf
index 8f059bbab..7f66cb642 100644
Binary files a/Software/DB/TCC/TCC_log.ldf and b/Software/DB/TCC/TCC_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index eb3eea5ab..ba2a022a1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -64,6 +64,9 @@
 
                             <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
                             <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
+
+                            <TextBlock FontWeight="SemiBold">Device COM Port</TextBlock>
+                            <TextBox Text="{Binding ActiveMachine.DeviceComPort}"></TextBox>
                         </controls:TableGrid>
                         <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="Silver" HorizontalAlignment="Center" Margin="50 50" />
                         <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
@@ -90,6 +93,12 @@
 
                             <TextBlock FontWeight="SemiBold">Is Demo Machine</TextBlock>
                             <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.IsDemo}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Suspend Version Update</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SuspendVersionUpdate}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Update Schema on Update</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.PerformSchemaUpdateOnDataUpdate}"></ToggleButton>
                         </controls:TableGrid>
                     </Grid>
                 </Border>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index fa9c95742..39ff7e54d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -145,6 +145,12 @@ namespace Tango.PPC.Common.MachineSetup
 
                 LogManager.Log($"Machine setup response received: {Environment.NewLine}{setup_response.ToJsonString()}");
 
+                if (!String.IsNullOrWhiteSpace(setup_response.DeviceComPort))
+                {
+                    settings.EmbeddedComPort = setup_response.DeviceComPort;
+                    settings.Save();
+                }
+
                 if (setup_response.SetupFirmware)
                 {
                     //Connecting to machine...
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index 3061b9506..31b2f5534 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -358,7 +358,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 ExaminerSequenceConfiguration config_sequence = ExaminerSequenceConfiguration.FromFile(config_file);
 
-                foreach (var item in config_sequence.Items.Where(x => x.Type == ExaminerSequenceItemType.Data).OrderBy(x => x.Index))
+                foreach (var item in config_sequence.Items.Where(x => x.Type == ExaminerSequenceItemType.Data || update_response.PerformSchemaUpdate).OrderBy(x => x.Index))
                 {
                     LogManager.Log($"Executing update script '{item.FileName}...'");
 
@@ -375,7 +375,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                     var config = builder.Build();
 
-                    ExaminerProcess process = new ExaminerProcess(config, ExaminerProcessType.Data);
+                    ExaminerProcess process = new ExaminerProcess(config, item.Type == ExaminerSequenceItemType.Data ? ExaminerProcessType.Data : ExaminerProcessType.Schema);
                     process.Progress += (x, msg) =>
                     {
                         LogManager.Log(msg);
@@ -389,7 +389,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                         if (result.ExitCode != ExaminerProcessExitCode.Success)
                         {
-                            throw LogManager.Log(new InvalidDataException(String.Format("OverrideData script has terminated with exit code '{0}'.", result.ExitCode)));
+                            throw LogManager.Log(new InvalidDataException($"{item.FileName} script has terminated with exit code '{result.ExitCode}'."));
                         }
 
                         LogManager.Log("Script executed successfully.");
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index a14d5ede7..ed3f7f796 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -136,7 +136,7 @@ namespace Tango.PPC.Common
             GradientGenerationResolution = 20;
             MachineScanningTimeoutSeconds = 20;
             LoggingCategories = new List<LogCategory>();
-            EmbeddedComPort = null;
+            EmbeddedComPort = "COM10";
             EmbeddedDeviceHint = "Tango USB Serial Port";
             ExternalBridgePassword = "Aa123456";
             HotSpotPassword = "Aa123456";
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs
index 7d142d5f7..b5a4c425d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs
@@ -24,5 +24,6 @@ namespace Tango.PPC.Common.Web
         public bool SetupFirmware { get; set; }
         public bool SetupFPGA { get; set; }
         public bool IsDemo { get; set; }
+        public String DeviceComPort { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs
index b98517e02..be7c0d076 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs
@@ -11,5 +11,6 @@ namespace Tango.PPC.Common.Web
     public class UpdateDBResponse : WebResponseMessage
     {
         public DataSource DataSource { get; set; }
+        public bool PerformSchemaUpdate { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
index 3a75cf256..95a95098c 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
@@ -197,5 +197,29 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// suspend version update
+        /// </summary>
+        public Boolean SuspendVersionUpdate 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// perform schema update on data update
+        /// </summary>
+        public Boolean PerformSchemaUpdateOnDataUpdate 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// device com port
+        /// </summary>
+        public String DeviceComPort 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
index d4a915a66..79a4e48f0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
@@ -55,6 +55,12 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Boolean> IsDemoChanged;
 
+        public event EventHandler<Boolean> SuspendVersionUpdateChanged;
+
+        public event EventHandler<Boolean> PerformSchemaUpdateOnDataUpdateChanged;
+
+        public event EventHandler<String> DeviceComPortChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged;
 
         public event EventHandler<ColorSpace> DefaultColorSpaceChanged;
@@ -661,6 +667,87 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Boolean _suspendversionupdate;
+
+        /// <summary>
+        /// Gets or sets the machinebase suspend version update.
+        /// </summary>
+
+        [Column("SUSPEND_VERSION_UPDATE")]
+
+        public  Boolean SuspendVersionUpdate
+        {
+            get 
+            {
+                return _suspendversionupdate; 
+            }
+
+            set 
+            {
+                if (_suspendversionupdate != value)
+                {
+                    _suspendversionupdate = value;
+
+                    OnSuspendVersionUpdateChanged(value);
+
+                }
+            }
+        }
+
+        protected Boolean _performschemaupdateondataupdate;
+
+        /// <summary>
+        /// Gets or sets the machinebase perform schema update on data update.
+        /// </summary>
+
+        [Column("PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE")]
+
+        public  Boolean PerformSchemaUpdateOnDataUpdate
+        {
+            get 
+            {
+                return _performschemaupdateondataupdate; 
+            }
+
+            set 
+            {
+                if (_performschemaupdateondataupdate != value)
+                {
+                    _performschemaupdateondataupdate = value;
+
+                    OnPerformSchemaUpdateOnDataUpdateChanged(value);
+
+                }
+            }
+        }
+
+        protected String _devicecomport;
+
+        /// <summary>
+        /// Gets or sets the machinebase device com port.
+        /// </summary>
+
+        [Column("DEVICE_COM_PORT")]
+
+        public  String DeviceComPort
+        {
+            get 
+            {
+                return _devicecomport; 
+            }
+
+            set 
+            {
+                if (_devicecomport != value)
+                {
+                    _devicecomport = value;
+
+                    OnDeviceComPortChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Cat> _cats;
 
         /// <summary>
@@ -1088,6 +1175,33 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(IsDemo));
         }
 
+        /// <summary>
+        /// Called when the SuspendVersionUpdate has changed.
+        /// </summary>
+        protected virtual void OnSuspendVersionUpdateChanged(Boolean suspendversionupdate)
+        {
+            SuspendVersionUpdateChanged?.Invoke(this, suspendversionupdate);
+            RaisePropertyChanged(nameof(SuspendVersionUpdate));
+        }
+
+        /// <summary>
+        /// Called when the PerformSchemaUpdateOnDataUpdate has changed.
+        /// </summary>
+        protected virtual void OnPerformSchemaUpdateOnDataUpdateChanged(Boolean performschemaupdateondataupdate)
+        {
+            PerformSchemaUpdateOnDataUpdateChanged?.Invoke(this, performschemaupdateondataupdate);
+            RaisePropertyChanged(nameof(PerformSchemaUpdateOnDataUpdate));
+        }
+
+        /// <summary>
+        /// Called when the DeviceComPort has changed.
+        /// </summary>
+        protected virtual void OnDeviceComPortChanged(String devicecomport)
+        {
+            DeviceComPortChanged?.Invoke(this, devicecomport);
+            RaisePropertyChanged(nameof(DeviceComPort));
+        }
+
         /// <summary>
         /// Called when the Cats has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
index ff0f49f58..ac820fd27 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
@@ -48,6 +48,9 @@ namespace Tango.DAL.Remote.DB
         public bool SETUP_FIRMWARE { get; set; }
         public bool SETUP_FPGA { get; set; }
         public bool IS_DEMO { get; set; }
+        public bool SUSPEND_VERSION_UPDATE { get; set; }
+        public bool PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE { get; set; }
+        public string DEVICE_COM_PORT { 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 03b1057eb..1eb53a02a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -675,6 +675,9 @@
           <Property Name="SETUP_FIRMWARE" Type="bit" Nullable="false" />
           <Property Name="SETUP_FPGA" Type="bit" Nullable="false" />
           <Property Name="IS_DEMO" Type="bit" Nullable="false" />
+          <Property Name="SUSPEND_VERSION_UPDATE" Type="bit" Nullable="false" />
+          <Property Name="PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE" Type="bit" Nullable="false" />
+          <Property Name="DEVICE_COM_PORT" Type="nchar" MaxLength="5" />
         </EntityType>
         <EntityType Name="MACHINES_EVENTS">
           <Key>
@@ -3593,6 +3596,9 @@
           <Property Name="SETUP_FIRMWARE" Type="Boolean" Nullable="false" />
           <Property Name="SETUP_FPGA" Type="Boolean" Nullable="false" />
           <Property Name="IS_DEMO" Type="Boolean" Nullable="false" />
+          <Property Name="SUSPEND_VERSION_UPDATE" Type="Boolean" Nullable="false" />
+          <Property Name="PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE" Type="Boolean" Nullable="false" />
+          <Property Name="DEVICE_COM_PORT" Type="String" MaxLength="5" FixedLength="true" Unicode="true" />
           <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_MACHINES" FromRole="MACHINE" ToRole="CAT" />
           <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_MACHINES_COLOR_SPACES" FromRole="MACHINE" ToRole="COLOR_SPACES" />
           <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_MACHINES_CONFIGURATIONS" FromRole="MACHINE" ToRole="CONFIGURATION" />
@@ -5723,6 +5729,9 @@
           <EntitySetMapping Name="MACHINES">
             <EntityTypeMapping TypeName="RemoteModel.MACHINE">
               <MappingFragment StoreEntitySet="MACHINES">
+                <ScalarProperty Name="DEVICE_COM_PORT" ColumnName="DEVICE_COM_PORT" />
+                <ScalarProperty Name="PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE" ColumnName="PERFORM_SCHEMA_UPDATE_ON_DATA_UPDATE" />
+                <ScalarProperty Name="SUSPEND_VERSION_UPDATE" ColumnName="SUSPEND_VERSION_UPDATE" />
                 <ScalarProperty Name="IS_DEMO" ColumnName="IS_DEMO" />
                 <ScalarProperty Name="SETUP_FPGA" ColumnName="SETUP_FPGA" />
                 <ScalarProperty Name="SETUP_FIRMWARE" ColumnName="SETUP_FIRMWARE" />
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 a1e09fab5..068e006ab 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,76 +5,76 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="44.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="4.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="17.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="14.5" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="27.5" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="11" PointY="52.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="26.125" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="61.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="5.25" PointY="30" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="18.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="39" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="57" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="11" PointY="56.375" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="7.25" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8.25" PointY="30.25" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="26.5" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="23.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="8.75" PointY="60.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="11" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9" PointY="1.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="40.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="5.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="3.75" PointY="46.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6" PointY="8.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="42.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="9.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="10.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6" PointY="4.5" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="11" PointY="46.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="13.25" PointY="17.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.5" PointY="24.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22.875" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="35.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="36.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="26.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="64.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="37.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.5" PointY="18" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="29.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="32.5" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="11" PointY="49.75" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="42.75" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="2" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.375" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="23.25" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="28.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="33.375" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="7.5" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="14.625" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="15.5" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="14.75" PointY="9.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="13.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="16.75" PointY="5.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="10.625" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="14" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="14" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="35.875" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="11.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="72.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="75.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="65.125" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="19.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="39.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="24.5" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="53.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="5.25" PointY="23.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="35.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="70.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="6" PointY="15.75" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="49.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="49" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="78.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="12" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="25" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="12.75" PointY="79.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="15" PointY="71.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="13.75" PointY="57.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="16" PointY="67.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="10.75" PointY="59.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="13" PointY="65.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="13.75" PointY="61.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="16" PointY="59.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.75" PointY="53.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="10" PointY="63.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="79.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="75.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="68.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.75" PointY="75.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="12" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="42.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="44" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.5" PointY="31.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="8.25" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="33.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="19.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="8.25" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="20.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="19.125" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="46" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="83" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="57.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="59.375" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="21.75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="6" PointY="38.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="39" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="10.5" PointY="17.875" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="28.5" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.25" PointY="29" />
+        <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="2.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="0.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="4.75" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="6" PointY="32.875" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="8.25" PointY="32" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="6" PointY="29.75" />
         <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/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index a2c761824..6f5eed749 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -204,16 +204,19 @@ namespace Tango.MachineService.Controllers
                     throw new AuthenticationException("The specified serial number could not be found.");
                 }
 
-                var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
+                if (!machine.SuspendVersionUpdate)
+                {
+                    var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
 
-                var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
+                    var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
 
-                if (Version.Parse(latest_machine_version.Version) > Version.Parse(request.Version))
-                {
-                    response.IsUpdateAvailable = true;
-                }
+                    if (Version.Parse(latest_machine_version.Version) > Version.Parse(request.Version))
+                    {
+                        response.IsUpdateAvailable = true;
+                    }
 
-                response.Version = latest_machine_version.Version;
+                    response.Version = latest_machine_version.Version;
+                }
             }
 
             return response;
@@ -237,6 +240,8 @@ namespace Tango.MachineService.Controllers
                     throw new AuthenticationException("The specified serial number could not be found.");
                 }
 
+                response.PerformSchemaUpdate = machine.PerformSchemaUpdateOnDataUpdate;
+
                 DbCredentials credentials = new DbCredentials();
 
                 using (SmoManager manager = new SmoManager())
-- 
cgit v1.3.1