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

1 files changed, 3 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupResponse.cs
index 89450a1d1..5e8885af7 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupResponse.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core;
 using Tango.Transport.Web;
 
 namespace Tango.PPC.Common.MachineSetup
@@ -13,9 +14,7 @@ namespace Tango.PPC.Common.MachineSetup
 
         public String BlobAddress { get; set; }
 
-        public String DbAddress { get; set; }
-        public String DbUserName { get; set; }
-        public String DbPassword { get; set; }
+        public DataSource DataSource { get; set; }
 
         public String OSKey { get; set; }
 
@@ -23,6 +22,7 @@ namespace Tango.PPC.Common.MachineSetup
         public bool SetupRemoteAssistance { get; set; }
         public bool SetupUWF { get; set; }
         public bool SetupFirmware { get; set; }
+        public bool SetupFPGA { get; set; }
         public bool IsDemo { get; set; }
     }
 }