merge conflicts -take remote

2 files changed, 8 insertions, 5 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
index abcd1c41f..95a26d78e 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
@@ -44,9 +44,6 @@ namespace Tango.MachineService.Controllers
                 client_version = new Version("1.0.0.0");
             }
 
-            bool versionChangeRequired = false;
-            String requiredVersion = null;
-
             var password = hash.Encrypt(request.Password);
 
             using (var db = ObservablesContextHelper.CreateContext())
@@ -104,8 +101,6 @@ namespace Tango.MachineService.Controllers
                 {
                     UserGuid = user.Guid,
                 }, DateTime.UtcNow.AddDays(1)).AccessToken,
-                VersionChangeRequired = versionChangeRequired,
-                RequiredVersion = requiredVersion,
                 PasswordChangeRequired = user.PasswordChangeRequired
             };
         }
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 71e540dbf..2049df665 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -344,6 +344,14 @@ namespace Tango.MachineService.Controllers
                         response.IsUpdateAvailable = true;
                     }
 
+                    if (!String.IsNullOrWhiteSpace(request.FirmwareVersion))
+                    {
+                        if (Version.Parse(latest_machine_version.FirmwareVersion) > Version.Parse(request.FirmwareVersion))
+                        {
+                            response.IsUpdateAvailable = true;
+                        }
+                    }
+
                     response.Version = latest_machine_version.Version;
                     response.FirmwareVersion = latest_machine_version.FirmwareVersion;