Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 5 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
index 387430f89..b9dacfcf9 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
@@ -200,7 +200,7 @@ namespace Tango.MachineService.Controllers
 
                 String comments = String.Join(Environment.NewLine, versions.OrderBy(x => Version.Parse(x.Version)).Where(x => Version.Parse(x.Version) > currentVersion).Select(x => x.Comments));
 
-                if (latestVersion != null && Version.Parse(latestVersion.Version) != currentVersion)
+                if (latestVersion != null && Version.Parse(latestVersion.Version) > currentVersion)
                 {
                     var manager = new BlobStorageManager();
                     var container = manager.GetContainer(MachineServiceConfig.FSE_VERSIONS_CONTAINER);
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 10af2f725..22feb29c1 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -788,10 +788,13 @@ namespace Tango.MachineService.Controllers
                     return new LatestVersionResponse()
                     {
                         Version = "0.0.0.0",
+                        FirmwareVersion = "0.0.0.0"
                     };
                 }
 
-                response.Version = versions.OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault().Version;
+                var latestTangoVersion = versions.OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
+                response.Version = latestTangoVersion.Version;
+                response.FirmwareVersion = latestTangoVersion.FirmwareVersion;
             }
 
             return response;