From 47fad304ebc8f056f1c5ffcde037c66029fc80c9 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 1 May 2018 14:44:53 +0300
Subject: Added device information for ConnectResponse. Fixed issue with razor
 parser. Added report issue option to application crash. Added
 DeviceInformation to MachineOperator. Added LastHardwareConfiguration to
 machine operator.

---
 .../Tango.MachineStudio.UI/App.xaml.cs             |  51 +++++++++-
 .../Console/ConsoleManager.cs                      |  14 +++
 .../Console/ConsoleWindow.xaml                     | 113 +++++++++++++++++++++
 .../Console/ConsoleWindow.xaml.cs                  |  28 +++++
 .../Console/ConsoleWindowVM.cs                     |  88 ++++++++++++++++
 .../DefaultStudioApplicationManager.cs             |   5 +
 .../TFS/SystemInformationModel.cs                  |   2 +-
 .../TFS/SystemInformationTemplate.cshtml           |  13 ++-
 .../TFS/TeamFoundationServiceExtendedClient.cs     |   9 +-
 .../Tango.MachineStudio.UI.csproj                  |   9 ++
 .../Tango.MachineStudio.UI/ViewModelLocator.cs     |  10 ++
 .../ViewModels/MainViewVM.cs                       |  14 +++
 .../Tango.MachineStudio.UI/Views/MainView.xaml     |   7 ++
 .../Windows/ExceptionResolutions.cs                |   3 +-
 .../Windows/ExceptionWindow.xaml                   |  12 ++-
 .../Windows/ExceptionWindow.xaml.cs                |   7 +-
 16 files changed, 374 insertions(+), 11 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleManager.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindowVM.cs

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

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index d9c64b9e3..f124ebb54 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -15,6 +15,11 @@ using Tango.Settings;
 using Tango.MachineStudio.Common.EventLogging;
 using Tango.BL.Enumerations;
 using Tango.Core.DI;
+using Tango.MachineStudio.UI.TFS;
+using Tango.TFS;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.UI.ViewModels;
+using Tango.MachineStudio.UI.Views;
 
 namespace Tango.MachineStudio.UI
 {
@@ -82,7 +87,26 @@ namespace Tango.MachineStudio.UI
 
             Application.Current.Dispatcher.Invoke(() =>
             {
-                ExceptionWindow exWin = new ExceptionWindow(e.Exception);
+                WorkItem bug = null;
+                TeamFoundationServiceExtendedClient tfsClient = null;
+                INotificationProvider notification = null;
+
+                try
+                {
+                    tfsClient = TangoIOC.Default.GetInstance<TeamFoundationServiceExtendedClient>();
+                    notification = TangoIOC.Default.GetInstance<INotificationProvider>();
+
+                    if (tfsClient != null && tfsClient.IsInitialized)
+                    {
+                        bug = tfsClient.CreateBug();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine(ex.ToString());
+                }
+
+                ExceptionWindow exWin = new ExceptionWindow(e.Exception, bug != null);
                 exWin.ShowDialog();
 
                 switch (exWin.Resolution)
@@ -100,6 +124,31 @@ namespace Tango.MachineStudio.UI
                         e.TryRecover = false;
                         LogManager.Log("User selection was to shutdown the application. Restarting...");
                         Environment.Exit(0);
+                        break;
+                    case ExceptionResolutions.Report:
+                        e.TryRecover = true;
+                        LogManager.Log("User selection was to report the issue.");
+
+                        if (bug != null)
+                        {
+                            notification.ShowModalDialog<ReportIssueViewVM, ReportIssueView>(new ReportIssueViewVM(tfsClient.Project, bug), async (vm) =>
+                            {
+                                using (notification.PushTaskItem("Uploading bug report..."))
+                                {
+                                    try
+                                    {
+                                        tfsClient.FinalizeBug(vm.WorkItem);
+                                        await tfsClient.UploadWorkItem(vm.WorkItem);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        notification.ShowError("An error occurred while trying to create the issue." + Environment.NewLine + ex.Message);
+                                    }
+                                }
+
+                            }, null);
+                        }
+
                         break;
                 }
             });
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleManager.cs
new file mode 100644
index 000000000..0a737c526
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleManager.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.DI;
+
+namespace Tango.MachineStudio.UI.Console
+{
+    public class ConsoleManager
+    {
+        public TangoIOC TangoIOC { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
new file mode 100644
index 000000000..90c07b1af
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
@@ -0,0 +1,113 @@
+<mahapps:MetroWindow x:Class="Tango.MachineStudio.UI.Console.ConsoleWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+        xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+        xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+        xmlns:views="clr-namespace:Tango.MachineStudio.UI.Views"
+        xmlns:sharedControls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+        xmlns:console="clr-namespace:Tango.MachineStudio.UI.Console"
+        xmlns:local="clr-namespace:Tango.MachineStudio.UI.Console"
+        mc:Ignorable="d"
+        Title="Developer Console" Height="800" Width="1280" BorderThickness="1" BorderBrush="#ADADAD" d:DataContext="{d:DesignInstance Type=console:ConsoleWindowVM, IsDesignTimeCreatable=False}" DataContext="{Binding ConsoleWindowVM, Source={StaticResource Locator}}" Foreground="Gainsboro">
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/FlatButton.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/VS/Colors.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/VS/Styles.xaml" />
+                <ResourceDictionary>
+                    <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" />
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Grid>
+        <DockPanel>
+            <materialDesign:ColorZone Background="#2E2E2E" Padding="16" materialDesign:ShadowAssist.ShadowDepth="Depth2"
+                                            Mode="PrimaryMid" DockPanel.Dock="Top">
+                <DockPanel>
+                    <Grid>
+                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Height="60" HorizontalAlignment="Center">
+                            <Image Source="/Images/machine-trans.png" RenderOptions.BitmapScalingMode="Fant"></Image>
+                            <TextBlock Text="Machine Studio" VerticalAlignment="Center" Margin="20 0 0 0" FontSize="36"/>
+                        </StackPanel>
+                    </Grid>
+                </DockPanel>
+            </materialDesign:ColorZone>
+
+            <Grid>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="1*"/>
+                    </Grid.RowDefinitions>
+
+                    <Grid Grid.Row="1" x:Name="grid">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="467*"/>
+                                <RowDefinition Height="5"/>
+                                <RowDefinition Height="200*"/>
+                            </Grid.RowDefinitions>
+
+                            <controls:ScriptEditorControl HighlightTypes="{Binding HighlightTypes}" IntellisenseTypes="{Binding IntellisenseTypes}"></controls:ScriptEditorControl>
+
+                            <GridSplitter Grid.Row="1" Background="#101010" Foreground="#202020" BorderBrush="#202020" Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
+
+                            
+                            <TextBox x:Name="txtLog" FontFamily="Lucida Console" Background="Black" BorderThickness="0" AcceptsReturn="True" VerticalScrollBarVisibility="Visible" Padding="5" IsReadOnly="True" TextWrapping="Wrap" FontSize="11" Foreground="Gainsboro" Grid.Row="2"></TextBox>
+                        </Grid>
+                    </Grid>
+                </Grid>
+
+                <Border HorizontalAlignment="Right" Margin="0 -1 10 0" VerticalAlignment="Top" Width="300" Height="40" Padding="5" CornerRadius="0 0 30 30" BorderThickness="1 0 1 1" BorderBrush="DimGray">
+                    <Border.Style>
+                        <Style TargetType="Border">
+                            <Setter Property="RenderTransform">
+                                <Setter.Value>
+                                    <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform>
+                                </Setter.Value>
+                            </Setter>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding NotificationProvider.HasTaskItems}" Value="True">
+                                    <DataTrigger.EnterActions>
+                                        <BeginStoryboard HandoffBehavior="Compose">
+                                            <Storyboard>
+                                                <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" FillBehavior="HoldEnd" To="1" Duration="00:00:0.2"></DoubleAnimation>
+                                            </Storyboard>
+                                        </BeginStoryboard>
+                                    </DataTrigger.EnterActions>
+                                    <DataTrigger.ExitActions>
+                                        <BeginStoryboard HandoffBehavior="Compose">
+                                            <Storyboard>
+                                                <DoubleAnimation BeginTime="00:00:02" FillBehavior="HoldEnd" Storyboard.TargetProperty="RenderTransform.ScaleY" To="0" From="1" Duration="00:00:0.5"></DoubleAnimation>
+                                            </Storyboard>
+                                        </BeginStoryboard>
+                                    </DataTrigger.ExitActions>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Border.Style>
+                    <Border.Background>
+                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                            <GradientStop Color="#03A9F4"/>
+                            <GradientStop Color="#0081BB" Offset="1"/>
+                        </LinearGradientBrush>
+                    </Border.Background>
+
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="20 0 0 0">
+                        <mahapps:ProgressRing Width="24" Height="24" Foreground="White"></mahapps:ProgressRing>
+                        <TextBlock Text="{Binding NotificationProvider.CurrentTaskItem.Message,Converter={StaticResource StringEllipsisConverter},ConverterParameter=35}" Foreground="White" VerticalAlignment="Center" Margin="10 0 0 0" TextWrapping="Wrap"></TextBlock>
+                    </StackPanel>
+                </Border>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</mahapps:MetroWindow>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml.cs
new file mode 100644
index 000000000..459c3d119
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml.cs
@@ -0,0 +1,28 @@
+using MahApps.Metro.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.UI.Console
+{
+    /// <summary>
+    /// Interaction logic for ConsoleWindow.xaml
+    /// </summary>
+    public partial class ConsoleWindow : MetroWindow
+    {
+        public ConsoleWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindowVM.cs
new file mode 100644
index 000000000..c88976948
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindowVM.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Threading;
+using Tango.Core.Commands;
+using Tango.MachineStudio.Common.Modules;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.UI.Console
+{
+    public class ConsoleWindowVM : ViewModel
+    {
+
+        /// <summary>
+        /// Gets or sets the additional highlight C# types.
+        /// </summary>
+        public ObservableCollection<KeyValuePair<String, Type>> HighlightTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the intellisense types.
+        /// </summary>
+        public ObservableCollection<KeyValuePair<String, Type>> IntellisenseTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the run command.
+        /// </summary>
+        public RelayCommand RunCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stop command.
+        /// </summary>
+        public RelayCommand StopCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the clear command.
+        /// </summary>
+        public RelayCommand ClearCommand { get; set; }
+
+        public ConsoleWindowVM(IStudioModuleLoader moduleLoader)
+        {
+            RunCommand = new RelayCommand(Run);
+            StopCommand = new RelayCommand(Stop);
+
+            HighlightTypes = new ObservableCollection<KeyValuePair<string, Type>>();
+            IntellisenseTypes = new ObservableCollection<KeyValuePair<string, Type>>();
+
+            IntellisenseTypes.Add(new KeyValuePair<string, Type>("consoleManager", typeof(ConsoleManager)));
+
+            foreach (var moduleType in moduleLoader.UserModules.SelectMany(x => x.MainViewType.Assembly.GetTypes()))
+            {
+                if (!moduleType.FullName.Contains("<") && !moduleType.FullName.Contains(">"))
+                {
+                    HighlightTypes.Add(new KeyValuePair<string, Type>(moduleType.FullName, moduleType));
+                }
+            }
+
+            HighlightTypes.Add(new KeyValuePair<string, Type>("Thread", typeof(Thread)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("DateTime", typeof(DateTime)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("TimeSpan", typeof(TimeSpan)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("Dispatcher", typeof(Dispatcher)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("Task", typeof(Task)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("List", typeof(IList<Object>)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("int", typeof(Int32)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("double", typeof(Double)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("String", typeof(String)));
+            HighlightTypes.Add(new KeyValuePair<string, Type>("string", typeof(String)));
+
+            foreach (var item in HighlightTypes)
+            {
+                IntellisenseTypes.Add(item);
+            }
+        }
+
+        private void Stop()
+        {
+
+        }
+
+        private void Run()
+        {
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 0bbcfd313..a5aa6261d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -229,6 +229,11 @@ namespace Tango.MachineStudio.UI.StudioApplication
             }
         }
 
+        /// <summary>
+        /// Notify the application manager about an external opened window.
+        /// When application exists. All registered windows will be closed.
+        /// </summary>
+        /// <param name="window">The window.</param>
         public void RegisterOpenedWindow(Window window)
         {
             _openedWindows.Add(window);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/SystemInformationModel.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/SystemInformationModel.cs
index e5e8b2d67..5dde73744 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/SystemInformationModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/SystemInformationModel.cs
@@ -15,7 +15,7 @@ namespace Tango.MachineStudio.UI.TFS
         public String HostName { get; set; }
         public Machine Machine { get; set; }
         public String ConfigurationString { get; set; }
-        public String HardwareString { get; set; }
+        public String LoadedHardwareConfigurationString { get; set; }
         public String LoadedProcessParametersString { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/SystemInformationTemplate.cshtml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/SystemInformationTemplate.cshtml
index 698932d46..54db28e32 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/SystemInformationTemplate.cshtml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/SystemInformationTemplate.cshtml
@@ -60,11 +60,18 @@
             </tbody>
         </table>
 
-        <div style="font-size:20pt;text-decoration:underline;margin-top:10px">Configuration</div>
+        <div style="font-size:20pt;text-decoration:underline;margin-top:10px">Machine Configuration</div>
         <div style="white-space:pre;margin-top:10px;font-size:8pt">@vm.ConfigurationString</div>
 
-        <div style="font-size:20pt;text-decoration:underline;margin-top:10px">Hardware Version</div>
-        <div style="white-space:pre;margin-top:10px;font-size:8pt">@vm.HardwareString</div>
+        <div style="font-size:20pt;text-decoration:underline;margin-top:10px">Hardware Configuration</div>
+        if (vm.LoadedHardwareConfigurationString != null)
+        {
+            <div style="white-space:pre;margin-top:10px;font-size:8pt">@vm.LoadedHardwareConfigurationString</div>
+        }
+        else
+        {
+            <div style="color:Red;margin-top:10px">NOT SET</div>
+        }
 
         <div style="font-size:20pt;text-decoration:underline;margin-top:10px">Process Parameters</div>
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
index 0a8cbd60d..4ca296523 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
@@ -181,7 +181,7 @@ namespace Tango.MachineStudio.UI.TFS
 
             SystemInformationModel sysModel = new SystemInformationModel();
             sysModel.ApplicationVersion = app.Version;
-            sysModel.EmbeddedVersion = "Fake Version";
+            sysModel.EmbeddedVersion = "N/A";
             sysModel.HostName = Environment.MachineName;
             sysModel.UserName = auth.CurrentUser.Contact.FullName;
 
@@ -190,6 +190,7 @@ namespace Tango.MachineStudio.UI.TFS
                 Machine machine = app.ConnectedMachine.Machine;
 
                 sysModel.Machine = machine;
+                sysModel.EmbeddedVersion = app.ConnectedMachine.DeviceInformation.Version;
 
                 MachineDesigner.Views.MainView machineView = new MachineDesigner.Views.MainView();
                 machineView.Width = 1280;
@@ -210,12 +211,16 @@ namespace Tango.MachineStudio.UI.TFS
                 });
 
                 sysModel.ConfigurationString = machine.Configuration.CloneConfiguration().ToJsonString(nameof(Configuration.MachinesConfigurations), nameof(Configuration.MachineVersions));
-                sysModel.HardwareString = machine.Configuration.HardwareVersion.ToJsonString(nameof(HardwareVersion.Configurations));
 
                 if (app.ConnectedMachine.CurrentProcessParameters != null)
                 {
                     sysModel.LoadedProcessParametersString = app.ConnectedMachine.CurrentProcessParameters.ToJsonString(nameof(ProcessParametersTable.ProcessParametersTablesGroup));
                 }
+
+                if (app.ConnectedMachine.CurrentHardwareConfiguration != null)
+                {
+                    sysModel.LoadedHardwareConfigurationString = app.ConnectedMachine.CurrentHardwareConfiguration.ToJsonString();
+                }
             }
 
             String html = String.Empty;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index c6afdca4b..3fd1e23fe 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -131,6 +131,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Console\ConsoleManager.cs" />
+    <Compile Include="Console\ConsoleWindow.xaml.cs">
+      <DependentUpon>ConsoleWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Console\ConsoleWindowVM.cs" />
     <Compile Include="Html\DefaultHtmlPresenter.cs" />
     <Compile Include="Html\HtmlWindow.xaml.cs">
       <DependentUpon>HtmlWindow.xaml</DependentUpon>
@@ -207,6 +212,10 @@
     <Compile Include="Windows\ModuleWindow.xaml.cs">
       <DependentUpon>ModuleWindow.xaml</DependentUpon>
     </Compile>
+    <Page Include="Console\ConsoleWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Html\HtmlWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 8d3a2c6bf..6e337c0e9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -13,6 +13,7 @@ using Tango.MachineStudio.Common.Speech;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.MachineStudio.Common.Video;
 using Tango.MachineStudio.UI.Authentication;
+using Tango.MachineStudio.UI.Console;
 using Tango.MachineStudio.UI.Html;
 using Tango.MachineStudio.UI.Modules;
 using Tango.MachineStudio.UI.Navigation;
@@ -85,6 +86,7 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Register<ConnectedMachineViewVM>();
             TangoIOC.Default.Register<MachineLoginViewVM>();
             TangoIOC.Default.Register<UpdateViewVM>();
+            TangoIOC.Default.Register<ConsoleWindowVM>();
 
             //Register View (Supervising Controller Pattern).
             //if (!ViewModelBase.IsInDesignModeStatic)
@@ -157,5 +159,13 @@ namespace Tango.MachineStudio.UI
                 return TangoIOC.Default.GetInstance<UpdateViewVM>();
             }
         }
+
+        public ConsoleWindowVM ConsoleWindowVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<ConsoleWindowVM>();
+            }
+        }
     }
 }
\ No newline at end of file
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 5beeeca54..04b973f23 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -153,6 +153,11 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// </summary>
         public RelayCommand OpenResolvedBugsCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the open developer console command.
+        /// </summary>
+        public RelayCommand OpenDeveloperConsoleCommand { get; set; }
+
         private IAuthenticationProvider _authenticationProvider;
         /// <summary>
         /// Gets or sets the authentication provider.
@@ -308,6 +313,7 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             ReportIssueCommand = new RelayCommand(ReportIssue);
             OpenResolvedBugsCommand = new RelayCommand(OpenResolvedBugs);
+            OpenDeveloperConsoleCommand = new RelayCommand(OpenDeveloperConsole);
         }
 
         private void MachineEventsStateProvider_EventsResolved(object sender, IEnumerable<MachinesEvent> e)
@@ -720,5 +726,13 @@ namespace Tango.MachineStudio.UI.ViewModels
 
             _notificationProvider.ShowModalDialog<ResolvedIssuesViewVM, ResolvedIssuesView>(vm, (_) => { }, null);
         }
+
+        private void OpenDeveloperConsole()
+        {
+            Console.ConsoleWindow console = new Console.ConsoleWindow();
+            ApplicationManager.RegisterOpenedWindow(console);
+            console.Owner = MainWindow.Instance;
+            console.Show();
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index bb46814b5..29bd70451 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -190,6 +190,13 @@
                                     </StackPanel>
                                 </Button>
                                 <Separator/>
+                                <Button Command="{Binding OpenDeveloperConsoleCommand}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <materialDesign:PackIcon Kind="Console" Width="24" Height="24" />
+                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Developer Console</TextBlock>
+                                    </StackPanel>
+                                </Button>
+                                <Separator/>
                                 <Button Command="{Binding ExitCommand}">
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon Kind="CloseCircleOutline" Width="24" Height="24" />
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionResolutions.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionResolutions.cs
index 2e7327559..e27a84c3b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionResolutions.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionResolutions.cs
@@ -10,6 +10,7 @@ namespace Tango.MachineStudio.UI.Windows
     {
         Shutdown,
         Restart,
-        Ignore
+        Ignore,
+        Report
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml
index 892e4944f..147b40892 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Tango.MachineStudio.UI.Windows"
         mc:Ignorable="d"
-        WindowStyle="None" ResizeMode="NoResize" Topmost="True" AllowsTransparency="True" WindowStartupLocation="CenterScreen" d:DesignHeight="300" d:DesignWidth="300" Width="610" Height="410" Background="Transparent" d:DataContext="{d:DesignInstance Type=local:ExceptionWindow, IsDesignTimeCreatable=False}">
+        WindowStyle="None" ResizeMode="NoResize" Topmost="True" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Width="800" Height="600" Background="Transparent" d:DataContext="{d:DesignInstance Type=local:ExceptionWindow, IsDesignTimeCreatable=False}">
     <Grid>
         <Border BorderThickness="1" BorderBrush="DodgerBlue" Background="White" Margin="10" CornerRadius="10">
             <Border.Effect>
@@ -48,8 +48,16 @@
                     </Grid>
 
                     <Grid Grid.Row="1">
-                        <Button HorizontalAlignment="Left" Width="140" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Ignore}">Ignore</Button>
+                        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
+                            <Button Width="140" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Ignore}">Ignore</Button>
+                        </StackPanel>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                            <Button x:Name="btnReport" Style="{StaticResource MaterialDesignFlatButton}" Width="150" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Report}">
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Source="/Images/bug.png" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                    <TextBlock Foreground="#FF5C5C" Margin="10 0 0 0" VerticalAlignment="Center">Report Issue</TextBlock>
+                                </StackPanel>
+                            </Button>
                             <Button Margin="5 0 0 0" Width="140" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Shutdown}">Shutdown</Button>
                             <Button Margin="5 0 0 0" Width="140" Command="{Binding ResolveCommand}" CommandParameter="{x:Static local:ExceptionResolutions.Restart}">Restart</Button>
                         </StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml.cs
index 0f74fee17..0a6f2de39 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ExceptionWindow.xaml.cs
@@ -33,10 +33,15 @@ namespace Tango.MachineStudio.UI.Windows
             DataContext = this;
         }
 
-        public ExceptionWindow(Exception ex) : this()
+        public ExceptionWindow(Exception ex, bool canReport) : this()
         {
             Exception = ex.FlattenException();
             ResolveCommand = new RelayCommand<ExceptionResolutions>(Resolve);
+
+            if (!canReport)
+            {
+                btnReport.Visibility = Visibility.Collapsed;
+            }
         }
 
         private void Resolve(ExceptionResolutions resolution)
-- 
cgit v1.3.1