Working on backup/restore...

3 files changed, 6 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
index fe4be700c..8914d55a5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
@@ -287,7 +287,7 @@ namespace Tango.PPC.UI.Navigation
                 }
                 else
                 {
-                    await Task.Delay(500);
+                    await Task.Delay(navigationControl.TransitionDuration.TimeSpan);
 
                     if (fromVM is PPCViewModel)
                     {
@@ -304,7 +304,7 @@ namespace Tango.PPC.UI.Navigation
             }
             else
             {
-                await Task.Delay(500);
+                await Task.Delay(navigationControl.TransitionDuration.TimeSpan);
 
                 if (fromVM is PPCViewModel)
                 {
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 c28a49584..e71e5794d 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
@@ -359,6 +359,9 @@
     <Resource Include="Images\GlobalStatus\service.png" />
     <Content Include="Manifests\release.xml" />
     <Content Include="Manifests\debug.xml" />
+    <None Include="firmware_package.tfp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -596,7 +599,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140.dll" "$(TargetDir)"
 copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(TargetDir)"
 copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(TargetDir)"
 
-del "$(TargetDir)firmware_package.tfp"
+if $(ConfigurationName) == Release del "$(TargetDir)firmware_package.tfp"
 
 if $(ConfigurationName) == Release del *.xml</PostBuildEvent>
   </PropertyGroup>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/firmware_package.tfp b/Software/Visual_Studio/PPC/Tango.PPC.UI/firmware_package.tfp
new file mode 100644
index 000000000..bc33e385a
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/firmware_package.tfp