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

1 files changed, 5 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index d8dc4a7b8..a77212787 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -224,6 +224,9 @@ namespace Tango.MachineService.Controllers
                     throw new AuthenticationException("The specified serial number could not be found.");
                 }
 
+                response.SetupFirmware = machine.SetupFirmware;
+                response.SetupFPGA = machine.SetupFpga;
+
                 if (!machine.SuspendVersionUpdate)
                 {
                     var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
@@ -375,6 +378,7 @@ namespace Tango.MachineService.Controllers
                             Version = request.Version,
                             BlobName = blob.Name,
                             MachineVersionGuid = request.MachineVersionGuid,
+                            FirmwareVersion = request.FirmwareVersion,
                         };
 
                         if (request.WithInstaller)
@@ -421,6 +425,7 @@ namespace Tango.MachineService.Controllers
                         UserGuid = upload.UserGuid,
                         Version = upload.Version,
                         MachineVersionGuid = upload.MachineVersionGuid,
+                        FirmwareVersion = upload.FirmwareVersion,
                     });
 
                     db.SaveChanges();