From 24a77fd5e03c81c6b0e901da02bce4bdccd4c71c Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 19 Jul 2018 14:32:56 +0300
Subject: Fixed a bug with logging module display timeline..

---
 .../MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
index c1f1cc77d..3c8a1e91c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
@@ -1 +1 @@
-Wed 07/18/2018 13:18:32.22 
+Thu 07/19/2018 14:26:11.83 
-- 
cgit v1.3.1


From c4feba445987d33c7bfcc304a3be368e8458d408 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 19 Jul 2018 14:48:11 +0300
Subject: Some log improvements in TransporterBase. Added dynamic display/hide
 debug logs on logging module.

---
 .../ViewModels/ApplicationLogsViewVM.cs            | 29 +++++++++++-----------
 .../Views/ApplicationLogsView.xaml                 | 10 +++++---
 .../Tango.MachineStudio.UI/Resources/BuildDate.txt |  2 +-
 .../Tango.Transport/TransporterBase.cs             |  4 ++-
 4 files changed, 25 insertions(+), 20 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
index c56ca5541..b0bc613bd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
@@ -57,6 +57,16 @@ namespace Tango.MachineStudio.Logging.ViewModels
             }
         }
 
+        private bool _displayDebug;
+        /// <summary>
+        /// Gets or sets a value indicating whether display debug logs.
+        /// </summary>
+        public bool DisplayDebug
+        {
+            get { return _displayDebug; }
+            set { _displayDebug = value; RaisePropertyChangedAuto(); }
+        }
+
         private LogItemBase _selectedLog;
         public LogItemBase SelectedLog
         {
@@ -169,21 +179,12 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void LogManager_NewLog(object sender, LogItemBase log)
         {
+            if (log.Category == LogCategory.Debug && !DisplayDebug) return;
+
             if (!RealTimePaused)
             {
                 InvokeUI(() =>
                 {
-                    if (_is_debug)
-                    {
-                        if (_realTimeLogs.Count > 1000)
-                        {
-                            for (int i = 998; i < _realTimeLogs.Count; i++)
-                            {
-                                _realTimeLogs.RemoveAt(i);
-                            }
-                        }
-                    }
-
                     _realTimeLogs.Insert(0, log);
                 });
             }
@@ -225,10 +226,10 @@ namespace Tango.MachineStudio.Logging.ViewModels
             if (SelectedLog != null && !_dialog_shown)
             {
                 _dialog_shown = true;
-                _notification.ShowModalDialog<LogDetailsViewVM, ApplicationLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) => 
+                _notification.ShowModalDialog<LogDetailsViewVM, ApplicationLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) =>
                 {
-                    
-                }, () => 
+
+                }, () =>
                 {
                     _dialog_shown = false;
                 });
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
index 310f4fd87..eeb7204d1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
@@ -100,10 +100,12 @@
                             </StackPanel>
                         </Button>
 
-                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 0 0">
-                            <materialDesign:PackIcon Kind="Magnify" Width="24" Height="24" />
-                            <TextBox VerticalAlignment="Center" Margin="10 0 0 0" Width="200" Text="{Binding Filter,UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding RealTimePaused}" materialDesign:HintAssist.Hint="Filter" />
-                        </StackPanel>
+                        <CheckBox VerticalAlignment="Center" Margin="20 0 0 0" IsChecked="{Binding DisplayDebug}" ToolTip="Hide/Display debug logs (applies only when debug logs are enabled in the settings file)">Process Debug Logs</CheckBox>
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 0 30 0">
+                        <materialDesign:PackIcon Kind="Magnify" Width="24" Height="24" />
+                        <TextBox VerticalAlignment="Center" Margin="10 0 0 0" Width="300" Text="{Binding Filter,UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding RealTimePaused}" materialDesign:HintAssist.Hint="Filter" />
                     </StackPanel>
                 </Grid>
             </Border>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
index 3c8a1e91c..625616f0e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
@@ -1 +1 @@
-Thu 07/19/2018 14:26:11.83 
+Thu 07/19/2018 14:46:09.13 
diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
index dbeae5b41..6b566ab58 100644
--- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
@@ -641,6 +641,8 @@ namespace Tango.Transport
                             LogManager.Log("Parsing message container...", LogCategory.Debug);
                             MessageContainer container = Encoder.DecodeContainer(data);
 
+                            LogManager.Log("Message was identified as " + container.Type + ".", LogCategory.Debug);
+
                             if (container.Token.Length != MESSAGE_TOKEN_LENGTH)
                             {
                                 LogManager.Log("Invalid message token length received: " + container.Token, LogCategory.Error);
@@ -683,7 +685,7 @@ namespace Tango.Transport
                                 }
                                 else
                                 {
-                                    LogManager.Log("Pending request was identified as 'continuous response' " + container.Type + ". keeping pending request.", LogCategory.Debug);
+                                    LogManager.Log("Pending request was identified as 'continuous response'. keeping pending request.", LogCategory.Debug);
 
                                     try
                                     {
-- 
cgit v1.3.1


From 3cb25038b7742c7599a0e1059a7ca280fae57e9a Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 19 Jul 2018 15:34:54 +0300
Subject: Machine Studio v1.0.0.18

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1572864 -> 1572864 bytes
 .../Tango.MachineStudio.UI/Resources/BuildDate.txt |   2 +-
 .../ViewModels/ConnectedMachineViewVM.cs           |  10 ++++
 .../ViewModels/MainViewVM.cs                       |  19 ++++++++
 .../Views/ConnectedMachineView.xaml                |   1 +
 .../Tango.Emulations/Emulators/MachineEmulator.cs  |   8 ++++
 .../Operation/IMachineOperator.cs                  |   7 +++
 .../Tango.Integration/Operation/MachineOperator.cs |  52 +++++++++++++++++++++
 Software/Visual_Studio/Versioning/Core.cs          |   4 +-
 Software/Visual_Studio/Versioning/MachineStudio.cs |   4 +-
 11 files changed, 102 insertions(+), 5 deletions(-)

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 968448467..e19de79a7 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index f2683eab3..83b27aee3 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
index 625616f0e..43f0c081d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
@@ -1 +1 @@
-Thu 07/19/2018 14:46:09.13 
+Thu 07/19/2018 15:24:26.26 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
index 76e138e0e..8034ceb69 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
@@ -18,6 +18,7 @@ namespace Tango.MachineStudio.UI.ViewModels
             Cancel,
             Disconnect,
             UploadHardwareConfig,
+            Reset,
         }
 
         private IStudioApplicationManager _applicationManager;
@@ -33,11 +34,20 @@ namespace Tango.MachineStudio.UI.ViewModels
 
         public RelayCommand UploadHardwareConfigurationCommand { get; set; }
 
+        public RelayCommand ResetCommand { get; set; }
+
         public ConnectedMachineViewVM(IStudioApplicationManager application)
         {
             ApplicationManager = application;
             DisconnectCommand = new RelayCommand(Disconnect);
             UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration);
+            ResetCommand = new RelayCommand(Reset);
+        }
+
+        private void Reset()
+        {
+            Result = ConnectedMachineVMResult.Reset;
+            Accept();
         }
 
         private void UploadHardwareConfiguration()
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index a7762a5e6..278926de9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -545,6 +545,25 @@ namespace Tango.MachineStudio.UI.ViewModels
                             }
                         }
                     }
+                    else if (x.Result == ConnectedMachineViewVM.ConnectedMachineVMResult.Reset)
+                    {
+                        if (NotificationProvider.ShowQuestion("This will reset the embedded device. Are you sure?"))
+                        {
+                            using (NotificationProvider.PushTaskItem("Uploading hardware configuration..."))
+                            {
+                                try
+                                {
+                                    await ApplicationManager.ConnectedMachine.Reset();
+                                    NotificationProvider.ShowInfo("Embedded device has been restarted.");
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogManager.Log(ex, "Error resetting embedded device.");
+                                    NotificationProvider.ShowError("Error resetting embedded device." + Environment.NewLine + ex.Message);
+                                }
+                            }
+                        }
+                    }
                 });
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index a4f253de3..39c42392d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -117,6 +117,7 @@
 
                 <Grid Grid.Row="1">
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Height="40" VerticalAlignment="Bottom">
+                        <Button Height="Auto" Width="140" Command="{Binding ResetCommand}" Background="#FF5454" BorderBrush="#FF5454" Margin="0 0 10 0" ToolTip="Reset the embedded device">RESET</Button>
                         <Button Height="Auto" Command="{Binding UploadHardwareConfigurationCommand}" ToolTip="Upload the current hardware configuration stored for this machine">
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock VerticalAlignment="Center">UPLOAD HW CONFIG</TextBlock>
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index ab32831a2..fa0be1ec5 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -251,6 +251,9 @@ namespace Tango.Emulations.Emulators
                 case MessageType.UploadHardwareConfigurationRequest:
                     HandleUploadHardwareConfigurationRequest(MessageFactory.ParseTangoMessageFromContainer<UploadHardwareConfigurationRequest>(container));
                     break;
+                case MessageType.StubFpgaWriteRegRequest:
+                    HandleResetRequest(MessageFactory.ParseTangoMessageFromContainer<StubFpgaWriteRegRequest>(container));
+                    break;
             }
         }
 
@@ -720,6 +723,11 @@ namespace Tango.Emulations.Emulators
             Transporter.SendResponse<UploadHardwareConfigurationResponse>(new UploadHardwareConfigurationResponse(), request.Container.Token);
         }
 
+        private void HandleResetRequest(TangoMessage<StubFpgaWriteRegRequest> request)
+        {
+            Transporter.SendResponse<StubFpgaWriteRegResponse>(new StubFpgaWriteRegResponse(), request.Container.Token);
+        }
+
         #endregion
 
         #region Public Methods
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
index 099641bd4..d17a70b98 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
@@ -14,6 +14,7 @@ using Tango.PMR.Hardware;
 using Tango.BL.Entities;
 using Google.Protobuf;
 using Tango.PMR.Connection;
+using Tango.PMR.Stubs;
 
 namespace Tango.Integration.Operation
 {
@@ -260,5 +261,11 @@ namespace Tango.Integration.Operation
         /// <param name="eventType">Type of the event.</param>
         /// <returns></returns>
         Task<ResolveEventResponse> ResolveEvent(PMR.Diagnostics.EventType eventType);
+
+        /// <summary>
+        /// Resets the embedded device.
+        /// </summary>
+        /// <returns></returns>
+        Task<StubFpgaWriteRegResponse> Reset();
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 9197264d3..bdfa8a218 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -23,6 +23,8 @@ using Google.Protobuf;
 using Tango.PMR.Connection;
 using Tango.BL.Enumerations;
 using Tango.BL.ColorConversion;
+using Tango.PMR.Stubs;
+using System.Threading;
 
 namespace Tango.Integration.Operation
 {
@@ -1090,6 +1092,56 @@ namespace Tango.Integration.Operation
             return await SendRequest<ResolveEventRequest, ResolveEventResponse>(request);
         }
 
+        /// <summary>
+        /// Resets the embedded device.
+        /// </summary>
+        /// <returns></returns>
+        public async Task<StubFpgaWriteRegResponse> Reset()
+        {
+            StubFpgaWriteRegResponse response = null;
+            StubFpgaWriteRegRequest request = null;
+
+            try
+            {
+                request = new StubFpgaWriteRegRequest()
+                {
+                    Address = 0x60000800 | 0x3D0,
+                    Value = 0x0
+                };
+
+                LogRequestSent(request);
+                response = await SendRequest<StubFpgaWriteRegRequest, StubFpgaWriteRegResponse>(request);
+                LogResponseReceived(response);
+            }
+            catch (Exception ex)
+            {
+                LogRequestFailed(request, ex);
+                throw ex;
+            }
+
+            Thread.Sleep(1000);
+
+            try
+            {
+                request = new StubFpgaWriteRegRequest()
+                {
+                    Address = 0x60000800 | 0x3D0,
+                    Value = 0x1
+                };
+
+                LogRequestSent(request);
+                response = await SendRequest<StubFpgaWriteRegRequest, StubFpgaWriteRegResponse>(request);
+                LogResponseReceived(response);
+            }
+            catch (Exception ex)
+            {
+                LogRequestFailed(request, ex);
+                throw ex;
+            }
+
+            return response;
+        }
+
         #endregion
 
         #region Private Methods
diff --git a/Software/Visual_Studio/Versioning/Core.cs b/Software/Visual_Studio/Versioning/Core.cs
index 4ee20543b..8f9866efa 100644
--- a/Software/Visual_Studio/Versioning/Core.cs
+++ b/Software/Visual_Studio/Versioning/Core.cs
@@ -9,5 +9,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
 [assembly: AssemblyTrademark("Twine LTD")]
 
-[assembly: AssemblyVersion("1.0.0.8")]
-[assembly: AssemblyFileVersion("1.0.0.8")]
+[assembly: AssemblyVersion("1.0.0.9")]
+[assembly: AssemblyFileVersion("1.0.0.9")]
diff --git a/Software/Visual_Studio/Versioning/MachineStudio.cs b/Software/Visual_Studio/Versioning/MachineStudio.cs
index ac6cd2e91..b5d8ad3a1 100644
--- a/Software/Visual_Studio/Versioning/MachineStudio.cs
+++ b/Software/Visual_Studio/Versioning/MachineStudio.cs
@@ -9,5 +9,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
 [assembly: AssemblyTrademark("Twine LTD")]
 
-[assembly: AssemblyVersion("1.0.0.17")]
-[assembly: AssemblyFileVersion("1.0.0.17")]
+[assembly: AssemblyVersion("1.0.0.18")]
+[assembly: AssemblyFileVersion("1.0.0.18")]
-- 
cgit v1.3.1


From 425a679e42f0b61f2f63d92955600cadbc698e1d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 19 Jul 2018 16:51:47 +0300
Subject: Implemented finalization stage on PPC.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1572864 -> 1572864 bytes
 .../Tango.MachineStudio.UI/Resources/BuildDate.txt |   2 +-
 .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs |   8 +++--
 .../Tango.PPC.Jobs/Views/JobProgressView.xaml      |  26 +++++++++++---
 .../Connection/DefaultMachineProvider.cs           |   2 +-
 .../Tango.Emulations/Emulators/MachineEmulator.cs  |   2 +-
 .../Tango.Integration/Operation/JobHandler.cs      |   6 ++++
 .../Operation/RunningJobStatus.cs                  |  40 +++++++++++++++++++++
 9 files changed, 77 insertions(+), 9 deletions(-)

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

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index e19de79a7..2cded7d21 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 83b27aee3..204c5d720 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
index 43f0c081d..46d6fac72 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
@@ -1 +1 @@
-Thu 07/19/2018 15:24:26.26 
+Thu 07/19/2018 16:03:40.90 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 0b53974d2..3ebefb00f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -337,7 +337,11 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             if (await NotificationProvider.ShowQuestion("Are you sure you want to remove the selected segment?"))
             {
-                Job.Segments.Remove(segment);
+                segment.BrushStops.ToList().ForEach(x =>
+                {
+                    _db.BrushStops.Remove(x);
+                });
+                _db.Segments.Remove(segment);
             }
         }
 
@@ -362,7 +366,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             if (brushStop.Segment.BrushStops.Count > 2)
             {
-                brushStop.Segment.BrushStops.Remove(brushStop);
+                _db.BrushStops.Remove(brushStop);
             }
             else
             {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index ecdd8b1a9..32f4cc7be 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -21,11 +21,18 @@
             <TextBlock FontSize="{StaticResource TangoHeaderFontSize}" HorizontalAlignment="Center" Text="{Binding Job.Name,FallbackValue='Job Name'}"></TextBlock>
 
             <Grid Margin="0 80 0 0">
-                <touch:TouchRingProgress Width="364" Height="364" Maximum="{Binding RunningJobStatus.TotalProgress}" Value="{Binding RunningJobStatus.Progress}" RingThickness="10">
+                <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
                     <touch:TouchRingProgress.Style>
                         <Style TargetType="touch:TouchRingProgress">
                             <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                            <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressWithoutFinalization}"></Setter>
+                            <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressWithoutFinalization}"></Setter>
                             <Style.Triggers>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsFinalizing}" Value="True">
+                                    <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
+                                    <Setter Property="Maximum" Value="{Binding RunningJobStatus.FinalizingTotalProgress}"></Setter>
+                                    <Setter Property="Value" Value="{Binding RunningJobStatus.FinalizingProgress}"></Setter>
+                                </DataTrigger>
                                 <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
                                     <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
                                 </DataTrigger>
@@ -47,8 +54,8 @@
                     </StackPanel>
 
                     <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
-                        <Run Text="{Binding RunningJobStatus.Progress,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgress,StringFormat=0,FallbackValue=0}"/>
-                        <Run FontSize="16">m</Run>
+                                            <Run Text="{Binding RunningJobStatus.ProgressWithoutFinalization,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressWithoutFinalization,StringFormat=0,FallbackValue=0}"/>
+                                            <Run FontSize="16">m</Run>
                     </TextBlock>
 
                     <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
@@ -83,7 +90,18 @@
                                             <Setter Property="Content">
                                                 <Setter.Value>
                                                     <StackPanel>
-                                                        <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">now dying</TextBlock>
+                                                        <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">
+                                                            <TextBlock.Style>
+                                                                <Style TargetType="TextBlock">
+                                                                    <Setter Property="Text" Value="now dying"></Setter>
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsFinalizing}" Value="True">
+                                                                            <Setter Property="Text" Value="finalizing"></Setter>
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </TextBlock.Style>
+                                                        </TextBlock>
                                                         <touch:TouchIcon Margin="0 8 0 0" HorizontalAlignment="Center" Icon="Water" Angle="180" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="40" Height="40" />
                                                     </StackPanel>
                                                 </Setter.Value>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index d0f8f4c6c..07022e7fb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -74,7 +74,7 @@ namespace Tango.PPC.Common.Connection
             try
             {
                 Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_9600);
-                var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, TimeSpan.FromSeconds(10));
+                var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, TimeSpan.FromSeconds(20));
 
                 await MachineOperator.Disconnect();
                 MachineOperator.Adapter = response.Adapter;
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index fa0be1ec5..a3b7690ed 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -438,7 +438,7 @@ namespace Tango.Emulations.Emulators
                     {
                         Status = new PMR.Printing.JobStatus()
                         {
-                            Progress = job.Length,
+                            Progress = job.Length + job.ProcessParameters.DryerBufferLength,
                         }
 
                     }, request.Container.Token, !_cancelJob);
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 2fc2ce5c0..6ddc14e3d 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -135,6 +135,8 @@ namespace Tango.Integration.Operation
             Status.TotalTime = job.GetEstimatedDuration(processParameters);
             Status.RemainingUnits = job.NumberOfUnits;
             Status.TotalProgress = Job.LengthIncludingNumberOfUnits + processParameters.DryerBufferLength;
+            Status.FinalizingTotalProgress = processParameters.DryerBufferLength;
+            Status.TotalProgressWithoutFinalization = Job.LengthIncludingNumberOfUnits;
             Status.CurrentUnitTotalProgress = Job.Length;
             Status.Progress = 0;
             Status.RemainingTime = Status.TotalTime;
@@ -222,6 +224,8 @@ namespace Tango.Integration.Operation
 
             if (s.Progress < Job.LengthIncludingNumberOfUnits)
             {
+                Status.ProgressWithoutFinalization += delta;
+
                 unit_segments = _effectiveSegments.ToList();
 
                 if (Job.EnableInterSegment && Job.NumberOfUnits > 1 && Status.RemainingUnits > 1)
@@ -329,10 +333,12 @@ namespace Tango.Integration.Operation
                     Status.CurrentUnitSegments = new List<Segment> { last_Segment };
                     Status.CurrentUnitTotalProgress = last_Segment.Length;
                     Status.CurrentUnitProgress = 0;
+                    Status.ProgressWithoutFinalization = Status.TotalProgressWithoutFinalization;
                     Finalizing?.Invoke(this, new EventArgs());
                 }
 
                 Status.CurrentUnitProgress += delta;
+                Status.FinalizingProgress += delta;
             }
         }
 
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs b/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
index a5f712a70..fa3b8bc07 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
@@ -63,6 +63,46 @@ namespace Tango.Integration.Operation
             set { _remainingProgress = value; RaisePropertyChangedAuto(); }
         }
 
+        private double _totalProgressWithoutFinalization;
+        /// <summary>
+        /// Gets or sets the total progress without finalization.
+        /// </summary>
+        public double TotalProgressWithoutFinalization
+        {
+            get { return _totalProgressWithoutFinalization; }
+            set { _totalProgressWithoutFinalization = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _progressWithoutFinalization;
+        /// <summary>
+        /// Gets or sets the progress without finalization.
+        /// </summary>
+        public double ProgressWithoutFinalization
+        {
+            get { return _progressWithoutFinalization; }
+            set { _progressWithoutFinalization = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _finalizingTotalProgress;
+        /// <summary>
+        /// Gets or sets the finalizing total progress.
+        /// </summary>
+        public double FinalizingTotalProgress
+        {
+            get { return _finalizingTotalProgress; }
+            set { _finalizingTotalProgress = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _finalizingProgress;
+        /// <summary>
+        /// Gets or sets the finalizing progress.
+        /// </summary>
+        public double FinalizingProgress
+        {
+            get { return _finalizingProgress; }
+            set { _finalizingProgress = value; RaisePropertyChangedAuto(); }
+        }
+
         private int _currentUnit;
         /// <summary>
         /// Gets or sets the current unit number.
-- 
cgit v1.3.1