Implemented RML import/export.

Fixed issue with MS in 1920x1080.
Added IP Address & Up Time to PPC.
Added ExternalBridge Icon IsInSession Indication.
Fixed issue with ExternalBridgeService disconnection.

15 files changed, 293 insertions, 51 deletions

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
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 61e14fbe8..5daca3dcb 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:{70552713-260E-497E-9E7D-B981A195F288} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{E8AB4A21-F3F1-4042-B887-975C81462A72} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.0.47.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.0.48.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="-"/>
@@ -400,7 +400,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.47"/>
+    <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.48"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 27d43bd20..4ab3bb1bb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -2565,7 +2565,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         private async void ImportJobFile()
         {
             OpenFileDialog dlg = new OpenFileDialog();
-            dlg.Title = "Import Job File";
+            dlg.Title = "Import Job Files";
             dlg.Filter = "Twine Job Files|*.job";
             dlg.Multiselect = true;
             if (dlg.ShowDialog().Value)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index a76799881..ee21b9ac3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -181,6 +181,10 @@ namespace Tango.MachineStudio.RML.ViewModels
 
         public RelayCommand CloneRmlCommand { get; set; }
 
+        public RelayCommand ExportRMLFileCommand { get; set; }
+
+        public RelayCommand ImportRMLFileCommand { get; set; }
+
         public MainViewVM(INotificationProvider notificationProvider)
         {
             _notification = notificationProvider;
@@ -199,6 +203,9 @@ namespace Tango.MachineStudio.RML.ViewModels
             ImportForwardDataCommand = new RelayCommand(ImportCCTData, () => ActiveRML != null && IsFree);
 
             ExportForwardDataCommand = new RelayCommand(ExportCCTData, () => ActiveRML != null && SelectedCCT != null && IsFree);
+
+            ExportRMLFileCommand = new RelayCommand(ExportRmlFile, () => SelectedRML != null && IsFree);
+            ImportRMLFileCommand = new RelayCommand(ImportRmlFile, () => IsFree);
         }
 
         public override void OnApplicationReady()
@@ -769,5 +776,89 @@ namespace Tango.MachineStudio.RML.ViewModels
         }
 
         #endregion
+
+        #region RML Import / Export
+
+        private async void ImportRmlFile()
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Title = "Import Thread Files";
+            dlg.Filter = "Twine Thread Files|*.rml";
+            dlg.Multiselect = true;
+
+            if (dlg.ShowDialog().Value)
+            {
+                using (_notification.PushTaskItem($"Importing thread files..."))
+                {
+                    try
+                    {
+                        IsFree = false;
+
+                        LogManager.Log($"Importing thread files...");
+
+                        using (ObservablesContext db = ObservablesContext.CreateDefault())
+                        {
+                            foreach (var file in dlg.FileNames)
+                            {
+                                var json = File.ReadAllText(file);
+                                var rmlFile = await Rml.FromRmlFile(db, json);
+
+                                db.Rmls.Add(rmlFile);
+                            }
+
+                            await db.SaveChangesAsync();
+                        }
+
+                        IsFree = true;
+
+                        _notification.ShowInfo($"Threads imported successfully.");
+
+                        LoadRmls();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error importing thread file.");
+                        _notification.ShowError($"An error occurred while trying to import the selected thread file.\n{ex.FlattenMessage()}");
+                    }
+                    finally
+                    {
+                        IsFree = true;
+                    }
+                }
+            }
+        }
+
+        private async void ExportRmlFile()
+        {
+            SaveFileDialog dlg = new SaveFileDialog();
+            dlg.Title = "Export Thread File";
+            dlg.Filter = "Twine Thread Files|*.rml";
+            dlg.DefaultExt = ".rml";
+            dlg.FileName = SelectedRML.Name;
+
+            if (dlg.ShowDialog().Value)
+            {
+                using (_notification.PushTaskItem($"Exporting Thread '{SelectedRML.Name}'..."))
+                {
+                    try
+                    {
+                        LogManager.Log($"Exporting Thread file {SelectedRML.Name}");
+
+                        using (ObservablesContext db = ObservablesContext.CreateDefault())
+                        {
+                            var rmlJsonFile = await SelectedRML.ToRmlFile(db);
+                            File.WriteAllText(dlg.FileName, rmlJsonFile);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error exporting Thread file.");
+                        _notification.ShowError($"An error occurred while trying to export thread '{SelectedRML.Name}'.\n{ex.FlattenMessage()}");
+                    }
+                }
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
index fdfc00ba6..288f00a3d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlsView.xaml
@@ -19,38 +19,58 @@
     </UserControl.Resources>
 
     <Grid>
-        <DockPanel Margin="100" MaxWidth="1200">
+        <DockPanel Margin="100 100 100 50" MaxWidth="1200">
             <Grid DockPanel.Dock="Top">
                 <Image Source="../Images/threads.png" Width="300" Margin="10" />
             </Grid>
             <Grid DockPanel.Dock="Bottom">
-                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveRmlCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
-                            <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                <StackPanel>
+                    <Grid>
+                        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveRmlCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                                </StackPanel>
+                            </Button>
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource OrangeBrush300}" BorderBrush="{StaticResource OrangeBrush300}" Command="{Binding CloneRmlCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="ContentCopy" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">DUPLICATE</TextBlock>
+                                </StackPanel>
+                            </Button>
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddRmlCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">NEW MEDIA</TextBlock>
+                                </StackPanel>
+                            </Button>
                         </StackPanel>
-                    </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource OrangeBrush300}" BorderBrush="{StaticResource OrangeBrush300}" Command="{Binding CloneRmlCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="ContentCopy" Width="20" Height="20" />
-                            <TextBlock Margin="5 0 0 0" FontSize="16">DUPLICATE</TextBlock>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                            <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageRmlCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" />
+                                    <TextBlock Margin="10 0 0 0" FontSize="18">EDIT</TextBlock>
+                                </StackPanel>
+                            </Button>
                         </StackPanel>
-                    </Button>
-                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddRmlCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
-                            <TextBlock Margin="5 0 0 0" FontSize="16">NEW MEDIA</TextBlock>
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageRmlCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" />
-                            <TextBlock Margin="10 0 0 0" FontSize="18">EDIT</TextBlock>
-                        </StackPanel>
-                    </Button>
+                    </Grid>
+
+                    <StackPanel Orientation="Horizontal" Margin="0 40 0 0">
+                        <Button Command="{Binding ImportRMLFileCommand}" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" Style="{StaticResource emptyButton}" Cursor="Hand">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Kind="FileImport" VerticalAlignment="Center" Width="30" Height="30" />
+                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Import Thread File</TextBlock>
+                            </StackPanel>
+                        </Button>
+
+                        <Button Margin="30 0 0 0" Command="{Binding ExportRMLFileCommand}" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" Style="{StaticResource emptyButton}" Cursor="Hand">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Kind="FileExport" VerticalAlignment="Center" Width="30" Height="30" />
+                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Export Thread File</TextBlock>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
                 </StackPanel>
             </Grid>
             <Grid>
@@ -63,11 +83,11 @@
                         </Style>
                     </DataGrid.CellStyle>
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
+                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="140" />
                         <DataGridTextColumn Header="MANUFACTURER" Binding="{Binding Manufacturer}" Width="Auto" />
                         <DataGridTextColumn Header="MATERIAL" Binding="{Binding MediaMaterial.Name}" Width="Auto" />
                         <DataGridTextColumn Header="PURPOSE" Binding="{Binding MediaPurpose.Name}" Width="Auto" />
-                        <DataGridTextColumn Header="CCT" Binding="{Binding Cct.FileName}" Width="Auto" />
+                        <DataGridTextColumn Header="CCT" Binding="{Binding Cct.FileName}" Width="110" />
                         <DataGridTextColumn Header="CCT VER" Binding="{Binding ColorConversionVersion}" Width="70" />
                         <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
                         <DataGridTemplateColumn Header="LIQUID FACTORS" Width="1*">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
index eecbcf8ad..a76749b05 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
@@ -15,8 +15,8 @@
         <Grid.Background>
             <ImageBrush ImageSource="/Images/White-Abstract.png" Stretch="Fill"></ImageBrush>
         </Grid.Background>
-        <!--<Viewbox Stretch="None" x:Name="viewbox">-->
-            <Grid x:Name="grid" Width="1920" Height="1100">
+        <!--<Viewbox Stretch="Fill" x:Name="viewbox">-->
+            <Grid x:Name="grid" Width="1920" Height="1145">
                 <Grid>
                     <sharedControls:NavigationControl TransitionAlwaysFades="True" TransitionType="Zoom" x:Name="NavigationControl" x:FieldModifier="public">
                         <views:LoadingView sharedControls:NavigationControl.NavigationName="LoadingView"></views:LoadingView>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
index d0eec65e2..915deb484 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
@@ -105,19 +105,24 @@ namespace Tango.MachineStudio.UI
             switch (ratio)
             {
                 case 16d / 9d:
-                    grid.Height = 1000;
+                    grid.Height = 1145;
+                    grid.Width = 2000;
                     break;
                 case 16d / 10d:
                     grid.Height = 1145;
+                    grid.Width = 1920;
                     break;
                 case 4d / 3d:
                     grid.Height = 1280;
+                    grid.Width = 1920;
                     break;
                 case 1366d / 768d:
                     grid.Height = 1100;
+                    grid.Width = 1920;
                     break;
                 default:
                     grid.Height = 1145;
+                    grid.Width = 1920;
                     break;
             }
         }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
index e01003c0b..444c1d09e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Management;
+using System.Net;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
@@ -40,6 +42,20 @@ namespace Tango.PPC.Technician.ViewModels
             set { _temperature = value; RaisePropertyChangedAuto(); }
         }
 
+        private TimeSpan _upTime;
+        public TimeSpan UpTime
+        {
+            get { return _upTime; }
+            set { _upTime = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _ipAddress;
+        public String IPAddress
+        {
+            get { return _ipAddress; }
+            set { _ipAddress = value; RaisePropertyChangedAuto(); }
+        }
+
         public RelayCommand ResetDeviceCommand { get; set; }
 
         public RelayCommand RestartCommand { get; set; }
@@ -132,6 +148,12 @@ namespace Tango.PPC.Technician.ViewModels
             _statsTimer.Start();
         }
 
+        public override void OnApplicationReady()
+        {
+            base.OnApplicationReady();
+            IPAddress = GetIpv4Address();
+        }
+
         private void _statsTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
             if (IsVisible)
@@ -139,6 +161,7 @@ namespace Tango.PPC.Technician.ViewModels
                 CPU = GetAppCPU();
                 RAM = GetAppRam();
                 //Temperature = GetTemperature();
+                UpTime = DateTime.Now - ApplicationManager.StartUpDate;
             }
         }
 
@@ -201,5 +224,25 @@ namespace Tango.PPC.Technician.ViewModels
                 return 0;
             }
         }
+
+        public String GetIpv4Address()
+        {
+            try
+            {
+                var host = Dns.GetHostEntry(Dns.GetHostName());
+                foreach (var ip in host.AddressList)
+                {
+                    if (ip.AddressFamily == AddressFamily.InterNetwork)
+                    {
+                        return ip.ToString();
+                    }
+                }
+                return "N/A";
+            }
+            catch (Exception ex)
+            {
+                return "N/A";
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
index f6e6370c1..f2bfcdf7d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
@@ -49,19 +49,34 @@
                     </TextBlock>
                 </UniformGrid>
 
-                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
-                    <touch:TouchButton Command="{Binding ResetDeviceCommand}" Height="60" Content="Reset Machine">
-                        <touch:TouchButton.Style>
-                            <Style TargetType="touch:TouchButton" BasedOn="{StaticResource {x:Type touch:TouchButton}}">
-                                <Setter Property="Background" Value="{StaticResource TangoErrorBrush}"></Setter>
-                            </Style>
-                        </touch:TouchButton.Style>
-                    </touch:TouchButton>
-                    <touch:TouchButton Command="{Binding RestartCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Restart Device</touch:TouchButton>
-                    <touch:TouchButton Command="{Binding ShutdownCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Shutdown Device</touch:TouchButton>
-                    <touch:TouchButton Command="{Binding FactoryResetCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Factory Reset</touch:TouchButton>
-                    <touch:TouchButton Command="{Binding ExitToExplorerCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Exit To Shell</touch:TouchButton>
-                </StackPanel>
+                <DockPanel>
+
+                    <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center">
+                        <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold" FontSize="{StaticResource TangoHeaderFontSize}">
+                        <Run>UP TIME:</Run>
+                        <Run Text="{Binding UpTime,StringFormat=hh\\:mm\\:ss,FallbackValue='00:00:00'}"></Run>
+                        </TextBlock>
+
+                        <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontWeight="SemiBold" FontSize="{StaticResource TangoHeaderFontSize}">
+                        <Run>IP ADDRESS:</Run>
+                        <Run Text="{Binding IPAddress}"></Run>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
+                        <touch:TouchButton Command="{Binding ResetDeviceCommand}" Height="60" Content="Reset Machine">
+                            <touch:TouchButton.Style>
+                                <Style TargetType="touch:TouchButton" BasedOn="{StaticResource {x:Type touch:TouchButton}}">
+                                    <Setter Property="Background" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                </Style>
+                            </touch:TouchButton.Style>
+                        </touch:TouchButton>
+                        <touch:TouchButton Command="{Binding RestartCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Restart Device</touch:TouchButton>
+                        <touch:TouchButton Command="{Binding ShutdownCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Shutdown Device</touch:TouchButton>
+                        <touch:TouchButton Command="{Binding FactoryResetCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Factory Reset</touch:TouchButton>
+                        <touch:TouchButton Command="{Binding ExitToExplorerCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Exit To Shell</touch:TouchButton>
+                    </StackPanel>
+                </DockPanel>
             </DockPanel>
         </Grid>
     </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
index 5f58be48b..7c67ac1a3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
@@ -96,6 +96,11 @@ namespace Tango.PPC.Common.Application
         String BuildDate { get; }
 
         /// <summary>
+        /// Gets the application startup date.
+        /// </summary>
+        DateTime StartUpDate { get; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether the screen is currently locked.
         /// </summary>
         bool IsScreenLocked { get; set; }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 6a9e42ce5..c7351aa4a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -120,6 +120,11 @@ namespace Tango.PPC.UI.PPCApplication
             }
         }
 
+        /// <summary>
+        /// Gets the application startup date.
+        /// </summary>
+        public DateTime StartUpDate { get; private set; }
+
         private bool _isScreenLocked;
         /// <summary>
         /// Gets or sets a value indicating whether the screen is currently locked.
@@ -171,6 +176,8 @@ namespace Tango.PPC.UI.PPCApplication
             bool initialized = false;
             bool isAfterSetup = false;
 
+            StartUpDate = DateTime.Now;
+
             await Task.Factory.StartNew(() =>
             {
                 try
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 db8540db7..a572fe23e 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.47.0")]
+[assembly: AssemblyVersion("1.0.48.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
index 5accd8ff3..0ee8058c0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
@@ -63,7 +63,18 @@
 
                         <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="AccessPointNetwork" Visibility="{Binding HotSpotProvider.IsEnabled,Converter={StaticResource BooleanToVisibilityConverter}}" />
 
-                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="Bridge" Visibility="{Binding ExternalBridgeService.Enabled,Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Icon="Bridge" Visibility="{Binding ExternalBridgeService.Enabled,Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <touch:TouchIcon.Style>
+                                <Style TargetType="touch:TouchIcon">
+                                    <Setter Property="Foreground" Value="{StaticResource TangoGrayBrush}"></Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding ExternalBridgeService.IsInSession}" Value="True">
+                                            <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </touch:TouchIcon.Style>
+                        </touch:TouchIcon>
 
                         <ItemsControl ItemsSource="{Binding NotificationProvider.TaskBarItems}">
                             <ItemsControl.ItemsPanel>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index 63c0a9dbe..b9224a6d6 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
+using Tango.BL.Builders;
+using Tango.BL.Serialization;
 
 namespace Tango.BL.Entities
 {
@@ -57,5 +59,48 @@ namespace Tango.BL.Entities
         {
             return ProcessParametersTablesGroups.FirstOrDefault(x => x.Active);
         }
+
+        public Task<String> ToRmlFile(ObservablesContext context)
+        {
+            return Task.Factory.StartNew<String>(() =>
+            {
+                var rml = new RmlBuilder(context).Set(Guid).WithActiveParametersGroup().WithCCT().WithLiquidFactors().Build();
+
+                String result = rml.ToJson(new EntitySerializationStrategy()
+                    .Include(() => rml.Cct)
+                    .Include(() => rml.LiquidTypesRmls)
+                    .Include(() => rml.ProcessParametersTablesGroups)
+                    .Include(typeof(ProcessParametersTablesGroup).GetProperty(nameof(ProcessParametersTablesGroup.ProcessParametersTables))),
+                    EntitySerializationFlags.IgnoreCollections | EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented);
+
+                return result;
+            });
+        }
+
+        public static Task<Rml> FromRmlFile(ObservablesContext context, String json)
+        {
+            return Task.Factory.StartNew<Rml>(() =>
+            {
+                Rml rml = Rml.FromJson(json,new EntitySerializationStrategy(),EntitySerializationFlags.Indented);
+
+                if (context.Rmls.Any(x => x.Guid == rml.Guid || x.Name == rml.Name))
+                {
+                    throw new InvalidOperationException($"Thread {rml.Name} already exist.");
+                }
+
+                if (rml.Cct != null)
+                {
+                    if (context.Ccts.Any(x => x.Guid == rml.Cct.Guid))
+                    {
+                        rml.Cct = null;
+                    }
+                }
+
+                rml.LastUpdated = DateTime.UtcNow;
+                rml.Code = context.Rmls.Max(x => x.Code) + 1;
+
+                return rml;
+            });
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
index 443f5f7cb..2824ed26a 100644
--- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
@@ -1191,7 +1191,7 @@ namespace Tango.Transport
                     }
                     catch (Exception ex) when (ex is TimeoutException || ex is AggregateException)
                     {
-                        if (State != TransportComponentState.Connected || aborted || Adapter.State == TransportComponentState.Failed) return;
+                        if (State != TransportComponentState.Connected || aborted || (Adapter.State == TransportComponentState.Failed && FailsWithAdapter)) return;
 
                         if (UseKeepAlive)
                         {