From 6463e83ca519892c94827d112bf4531272c1b55f Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 6 Mar 2019 17:45:17 +0200
Subject: Implemented Color Calibration on Machine Designer!

---
 .../Tango.MachineStudio.Common.csproj              | 62 +++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 2af5c37ec..bb059d67b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -84,6 +84,9 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Authentication\AuthenticationLoginResult.cs" />
+    <Compile Include="Controls\MachineView.xaml.cs">
+      <DependentUpon>MachineView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Converters\UserRoleToBooleanConverter.cs" />
     <Compile Include="Converters\UserRoleToVisibilityConverter.cs" />
     <Compile Include="Web\LoginRequest.cs" />
@@ -155,6 +158,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\MachineView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Controls\MdiContainerControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -328,7 +335,60 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\android.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\app.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\application-firmware.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\cartridge.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\dispenser.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\embedded-software.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\embedded.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\formula.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\hardware.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\injection.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\liquid.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine-designer-module.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine-full-fx.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine-sketch.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\mid-tank.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\tablet.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\tank.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\ti-tm4c129x.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-- 
cgit v1.3.1


From ac144491328ec237859baf4048e4d99f6f42139c Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 6 Mar 2019 18:25:07 +0200
Subject: Fixed some issues with firmware version upgrade.

---
 .../Tango.MachineStudio.Common.csproj                  |  8 +-------
 .../Tango.Integration/Operation/MachineOperator.cs     | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index bb059d67b..4cf1855ca 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -368,15 +368,9 @@
   <ItemGroup>
     <Resource Include="Images\liquid.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\machine-designer-module.jpg" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\machine-full-fx.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\machine-sketch.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\mid-tank.png" />
   </ItemGroup>
@@ -392,7 +386,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <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/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index d49dcc53c..c13961191 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -2048,10 +2048,13 @@ namespace Tango.Integration.Operation
         {
             bool cancel = false;
             ZipFile zip = null;
+            Action abortAction = null;
 
             var upgradeHandler = new FirmwareUpgradeHandler(() =>
             {
                 cancel = true;
+
+                abortAction?.Invoke();
             });
 
             try
@@ -2061,8 +2064,6 @@ namespace Tango.Integration.Operation
                     throw LogManager.Log(new InvalidOperationException($"Could not perform firmware upgrade while operator status is '{Status}'."));
                 }
 
-                Status = MachineStatuses.Upgrading;
-
                 var package_info = await GetFirmwarePackageInfo(tfpStream);
                 tfpStream.Position = 0;
 
@@ -2094,6 +2095,13 @@ namespace Tango.Integration.Operation
                 Action activate = null;
                 Action postActivation = null;
 
+                Status = MachineStatuses.Upgrading;
+
+                abortAction = new Action(() =>
+                {
+                    Status = MachineStatuses.ReadyToDye;
+                });
+
                 upgradeDFU = new Action(() =>
                 {
                     try
@@ -2151,6 +2159,7 @@ namespace Tango.Integration.Operation
                     }
                     catch (Exception ex)
                     {
+                        Status = MachineStatuses.ReadyToDye;
                         upgradeHandler.RaiseFailed(ex);
                         return;
                     }
@@ -2170,9 +2179,9 @@ namespace Tango.Integration.Operation
 
                             var handler = storage.UploadFile(Path.Combine(package_folder, entry.FileName), reader).Result;
                             handlers.Add(handler);
-                            handler.Canceled += (_, __) => { upgradeHandler.RaiseCanceled(); cancel = true; };
+                            handler.Canceled += (_, __) => { upgradeHandler.RaiseCanceled(); cancel = true; abortAction(); };
                             handler.Completed += (_, __) => uploadNext();
-                            handler.Failed += (_, failedEx) => { upgradeHandler.RaiseFailed(failedEx); cancel = true; };
+                            handler.Failed += (_, failedEx) => { upgradeHandler.RaiseFailed(failedEx); cancel = true; abortAction(); };
                             handler.Progress += (_, e) =>
                             {
                                 if (cancel)
@@ -2186,6 +2195,7 @@ namespace Tango.Integration.Operation
                         }
                         catch (Exception ex)
                         {
+                            abortAction();
                             upgradeHandler.RaiseFailed(ex);
                         }
                     }
-- 
cgit v1.3.1