Implemented some improvements for PPC.

4 files changed, 5 insertions, 37 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
index edc7cce52..364ca8ee7 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs
@@ -26,9 +26,6 @@ namespace Tango.PPC.UI
     /// </summary>
     public partial class MainWindow : Window
     {
-        private String _technician_mode_buffer;
-        private Viewbox viewBox;
-
         public static MainWindow Instance { get; private set; }
 
         public MainWindow()
@@ -37,8 +34,6 @@ namespace Tango.PPC.UI
 
             InitializeComponent();
 
-            _technician_mode_buffer = String.Empty;
-
             bool has_touch = false;
 
 #if !DESKTOP
@@ -91,34 +86,5 @@ namespace Tango.PPC.UI
         {
             TangoIOC.Default.GetInstance<IPPCApplicationManager>().ShutDown();
         }
-
-        protected override void OnPreviewKeyDown(System.Windows.Input.KeyEventArgs e)
-        {
-            base.OnPreviewKeyDown(e);
-
-            try
-            {
-                _technician_mode_buffer += Char.Parse(e.Key.ToString());
-            }
-            catch{}
-
-            if (e.Key == Key.Return || e.Key == Key.Tab)
-            {
-                if (_technician_mode_buffer.ToLower().Contains("ENTERTECHNICIAN".ToLower()))
-                {
-                    _technician_mode_buffer = String.Empty;
-                    TangoIOC.Default.GetInstance<IPPCApplicationManager>().EnterTechnicianMode();
-                    e.Handled = true;
-                }
-                else if (_technician_mode_buffer.ToLower().Contains("EXITTECHNICIAN".ToLower()))
-                {
-                    _technician_mode_buffer = String.Empty;
-                    TangoIOC.Default.GetInstance<IPPCApplicationManager>().ExitTechnicianMode();
-                    e.Handled = true;
-                }
-
-                _technician_mode_buffer = String.Empty;
-            }
-        }
     }
 }
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 43b0cc047..4b5874907 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -161,11 +161,13 @@ namespace Tango.PPC.UI.PPCApplication
 
                     //Start watchdog
                     _watchdogServer = new WatchDogServer(Application.Current.Dispatcher);
-
+#if RELEASE
+                   
                     if (settings.EnableWatchDog)
                     {
                         _watchdogServer.Start();
                     }
+#endif
 
                     LogManager.Log("Reading Core settings...");
                     var coreSettings = SettingsManager.Default.GetOrCreate<CoreSettings>();
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index f40bfa7de..1891139e9 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -509,7 +509,7 @@ del "$(TargetDir)firmware_package.tfp"</PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index d72e75011..efc5f8179 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
       </requestedPrivileges>
     </security>
   </trustInfo>